Merge branch 'master' into 4.0.x (back button default behaviour fix)

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

framework/src/org/apache/cordova/AndroidChromeClient.java

@@ -107,6 +107,7 @@ public class AndroidChromeClient extends WebChromeClient implements CordovaChrom
      * @param url
      * @param message
      * @param result
+     * @see Other implementation in the Dialogs plugin.
      */
     @Override
     public boolean onJsAlert(WebView view, String url, String message, final JsResult result) {
@@ -150,6 +151,7 @@ public class AndroidChromeClient extends WebChromeClient implements CordovaChrom
      * @param url
      * @param message
      * @param result
+     * @see Other implementation in the Dialogs plugin.
      */
     @Override
     public boolean onJsConfirm(WebView view, String url, String message, final JsResult result) {
@@ -204,6 +206,7 @@ public class AndroidChromeClient extends WebChromeClient implements CordovaChrom
      * @param message
      * @param defaultValue
      * @param result
+     * @see Other implementation in the Dialogs plugin.
      */
     @Override
     public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) {

framework/src/org/apache/cordova/AndroidWebView.java

@@ -772,12 +772,6 @@ public class AndroidWebView extends WebView implements CordovaWebView {
                         return true;
                     }
                     // If not, then invoke default behavior
-                    else {
-                        //this.activityState = ACTIVITY_EXITING;
-                    	//return false;
-                    	// If they hit back button when app is initializing, app should exit instead of hang until initialization (CB2-458)
-                    	this.cordova.getActivity().finish();
-                    }
                 }
             }
         }