Merge branch 'master' into Daniel
Fixing app.js
Merge branch 'Daniel'