Merge branch 'gh-pages'
Updated the js.app
Merge branch 'master' into gh-pages