modified some renders for app.js
Merge branch 'dev'