Merge remote-tracking branch 'origin/master'

# Conflicts:
#	plugin.xml

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
 				xmlns:android="http://schemas.android.com/apk/res/android"
 				id="com.phonegap.plugins.PushPlugin"
-				version="2.5.8">
+				version="3.0.0">
 
 	<name>PushPlugin</name>
 
@@ -26,6 +26,7 @@
 
 	<engines>
 		<engine name="cordova" version=">=3.0.0"/>
+		<engine name="cordova-android" version=">=3.6.0"/>
 	</engines>
 
 	<dependency id="org.apache.cordova.device"/>
@@ -67,14 +68,7 @@
 		<source-file src="src/android/com/plugin/gcm/CordovaGCMBroadcastReceiver.java" target-dir="src/com/plugin/gcm/"/>
 		<source-file src="src/android/com/plugin/gcm/PushHandlerActivity.java" target-dir="src/com/plugin/gcm/"/>
 		<source-file src="src/android/com/plugin/gcm/PushPlugin.java" target-dir="src/com/plugin/gcm/"/>
-		<source-file src="src/android/com/plugin/android-support-v4.jar" target-dir="libs/"/>
-
-		<!-- NOTE: Requires plugman 4.2.0-ish, so older versions won't benefit of this shrink script.
-          If you're building with Cordova-Android 4 it will likely work.
-         To test it simply comment this line and rebuild. Your APK should be bigger with this script disabled.
-     -->
-		<framework src="src/android/shrinkresources.gradle" custom="true" type="gradleReference" />
-
+		<framework src="com.android.support:support-v4:+" />
 	</platform>
 
 	<!-- ios -->