cordova 3.4.0 to 3.5.0
merge