Make setWebViewClient an override instead of an overload. Delete Location-change JS->Native bridge mode (missed some of it).
Merge branch 'master' into 4.0.x (tweaks to setWebViewClient)

Conflicts:
	framework/src/org/apache/cordova/CordovaWebView.java
	framework/src/org/apache/cordova/CordovaWebViewClient.java