forked from github/cordova-android

Conflicts: bin/templates/cordova/defaults.xml framework/res/xml/config.xml framework/src/org/apache/cordova/CordovaWebView.java
Conflicts: bin/templates/cordova/defaults.xml framework/res/xml/config.xml framework/src/org/apache/cordova/CordovaWebView.java