Merge phonegap 2.9