Fixing Phonegap master merge