Add animation on load-in
fix merge conflict
Merge branch 'deploy' into development