figure app.js bug
Merge branch 'develop' of github.com:eebhub/platform into develop