finished drag resizing and reordering on timeline
Merge branch 'dragon-fusion' of https://github.com/cman131/Dragon-Drop-Prototype into dragon-fusion