Merge "Added transitions when dropping items onto Folders, fixed bugs"