Merge branch 'release/1.0'
Merge branch 'release/1.2'
Faster folder animation.
Merge branch 'hotfix/Faster-Folders' into develop