Updating boilerplate with animations, js fixes, etc.
Merge branch 'refs/heads/mockup' into gh-pages