Update controller.js
Update app.js
megring from develop
Merge branch 'develop'
Merge branch 'master' into gh-pages
merging
merging
Merge branch 'develop' into gh-pages
updating build script
updating build script
Merge branch 'gh-pages' into develop