Updated cordova and build scripts
Merge remote-tracking branch 'upstream/master'