app.js renamed to doc_app.js
Merge branch 'master' into gh-pages