refactoring animations
Merge branch 'develop'