forked from github/cordova-android

Conflicts: VERSION bin/templates/cordova/version framework/src/org/apache/cordova/CordovaWebView.java package.json test/src/org/apache/cordova/test/basicauth.java test/src/org/apache/cordova/test/menus.java
Conflicts: VERSION bin/templates/cordova/version framework/src/org/apache/cordova/CordovaWebView.java package.json test/src/org/apache/cordova/test/basicauth.java test/src/org/apache/cordova/test/menus.java