Merge branch 'master' into 4.0.x

Conflicts:
	bin/templates/project/custom_rules.xml
	framework/src/org/apache/cordova/CordovaWebView.java
	test/src/org/apache/cordova/test/junit/MessageTest.java

bin/templates/project/AndroidManifest.xml

@@ -34,10 +34,12 @@
 
     <application android:icon="@drawable/icon" android:label="@string/app_name"
         android:hardwareAccelerated="true">
-        <activity android:name="__ACTIVITY__" android:label="@string/app_name" android:launchMode="singleTop"
+        <activity android:name="__ACTIVITY__"
+                android:label="@string/activity_name"
+                android:launchMode="singleTop"
                 android:theme="@android:style/Theme.Black.NoTitleBar"
                 android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">
-            <intent-filter>
+            <intent-filter android:label="@string/launcher_name">
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
@@ -45,4 +47,4 @@
     </application>
 
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="__APILEVEL__"/>
-</manifest> 
+</manifest>