updated for cordova
merged cordova changes to head
updated head for cordova