Clean in master
Fix view and up scroll animations
Merge branch 'master' into gh-pages