ticket:2 fix app.js
ticket:2 merging fix for app