Move registration of App plugin from config.xml -> code

Less fragile this way.
Merge branch 'master' into 4.0.x (App plugin from config.xml -> code)

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