Merging my Master copy with the Phonegap master copy