Fixing Phonegap master merge
PHONEGAP & GIT INTEGRATION DOESN'T WORK.
Reverting to separate directory structures.
Fixed app.js