Updated documentation for app.js
Updates to app.js doc, and fixing merge conflicts.