Cordova

Merging cordova branch to master.