Merge branch 'master' into 4.0.x (unit test tweaks)

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

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

@@ -19,6 +19,8 @@
 
 package org.apache.cordova;
 
+import java.util.List;
+
 import android.app.Activity;
 import android.util.Log;
 
@@ -87,4 +89,16 @@ public class Config {
     public static Whitelist getWhitelist() {
         return parser.getWhitelist();
     }
+
+    public static List<PluginEntry> getPluginEntries() {
+        return parser.getPluginEntries();
+    }
+    
+    public static CordovaPreferences getPreferences() {
+        return parser.getPreferences();
+    }
+
+    public static boolean isInitialized() {
+        return parser != null;
+    }
 }