Corrected gulpfile
Corrected animations
Merge branch 'master' into gh-pages
Update