merged changes from master.  added commented out app.js code to commented out code in angular app.js.  (reformatted)