fix a bug in app.js
Merge branch 'dev'