small changes
Merge branch 'master' of https://github.com/NWEN304-2014/Judas-Phonegap