Bug fixes
Phonegap upgrade