Completed Phonegap merge