animation finalizied
Merge branch 'animation' into develop