fixed app.js after phonegap merge
Merge branch 'master' of https://github.com/arikalfus/Jeeves