Put app.js in the page's header.
Merge branch 'master' into gh-pages