diff --git a/android/3rd_party/facebook-android-sdk/build.gradle b/android/3rd_party/facebook-android-sdk/build.gradle
index e599548ac2..3443d41a1a 100644
--- a/android/3rd_party/facebook-android-sdk/build.gradle
+++ b/android/3rd_party/facebook-android-sdk/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.10.+'
+        classpath propGradleAndroidPlugin
     }
 }
 
diff --git a/android/3rd_party/facebook-android-sdk/facebook/build.gradle b/android/3rd_party/facebook-android-sdk/facebook/build.gradle
index 29a1fc8ad1..d0973c8e36 100644
--- a/android/3rd_party/facebook-android-sdk/facebook/build.gradle
+++ b/android/3rd_party/facebook-android-sdk/facebook/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'android-library'
 
 dependencies {
-    compile 'com.android.support:support-v4:20.0.+'
-    compile 'com.parse.bolts:bolts-android:1.1.2'
+    compile 'com.android.support:support-v4:+'
+    compile 'com.parse.bolts:bolts-android:+'
 }
 
 android {
diff --git a/android/3rd_party/facebook-android-sdk/gradle/wrapper/gradle-wrapper.jar b/android/3rd_party/facebook-android-sdk/gradle/wrapper/gradle-wrapper.jar
index 667288ad6c..3d0dee6e8e 100644
Binary files a/android/3rd_party/facebook-android-sdk/gradle/wrapper/gradle-wrapper.jar and b/android/3rd_party/facebook-android-sdk/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/android/3rd_party/facebook-android-sdk/gradle/wrapper/gradle-wrapper.properties b/android/3rd_party/facebook-android-sdk/gradle/wrapper/gradle-wrapper.properties
index 23bdf0c697..f373e54507 100644
--- a/android/3rd_party/facebook-android-sdk/gradle/wrapper/gradle-wrapper.properties
+++ b/android/3rd_party/facebook-android-sdk/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 17 21:31:41 PDT 2014
+#Tue Oct 21 17:06:20 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 4aff5187e9..c1353de93f 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -9,7 +9,7 @@
 
   <uses-sdk
       android:minSdkVersion="7"
-      tools:node="replace"/>
+      tools:overrideLibrary="com.google.android.gms" />
 
   <uses-feature
       android:glEsVersion="0x00020000"
diff --git a/android/YoPme/build.gradle b/android/YoPme/build.gradle
index 006d9839fb..8fcd631f2e 100644
--- a/android/YoPme/build.gradle
+++ b/android/YoPme/build.gradle
@@ -4,7 +4,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.12.1'
+    classpath propGradleAndroidPlugin
   }
 }
 
@@ -29,7 +29,7 @@ task ndkBuildClean(type:Exec, description: 'Clean native libraries') {
   commandLine NDK_BUILD, 'clean'
 }
 
-tasks.withType(Compile) { compileTask -> compileTask.dependsOn ndkBuild }
+tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn ndkBuild }
 
 clean.dependsOn 'ndkBuildClean'
 
diff --git a/android/YoPme/gradle/wrapper/gradle-wrapper.jar b/android/YoPme/gradle/wrapper/gradle-wrapper.jar
index 3c7abdf127..3d0dee6e8e 100644
Binary files a/android/YoPme/gradle/wrapper/gradle-wrapper.jar and b/android/YoPme/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/android/YoPme/gradle/wrapper/gradle-wrapper.properties b/android/YoPme/gradle/wrapper/gradle-wrapper.properties
index 8eb8c856b8..f373e54507 100644
--- a/android/YoPme/gradle/wrapper/gradle-wrapper.properties
+++ b/android/YoPme/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Apr 24 20:55:59 FET 2014
+#Tue Oct 21 17:06:20 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
diff --git a/android/build.gradle b/android/build.gradle
index 126de56c58..1e5caba06c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.12.2'
+    classpath propGradleAndroidPlugin
   }
 }
 
@@ -178,10 +178,14 @@ android {
     abortOnError false
   }
 
+  // version at the end of each built apk
   applicationVariants.all { variant ->
-    // version at the end of each built apk
-    def file = variant.outputFile
-    variant.outputFile = new File(file.parent, file.name.replace(".apk", "-" + defaultConfig.versionName + "-" + getDate() + ".apk"))
+    variant.outputs.each { output ->
+      if (output.outputFile != null && output.outputFile.name.endsWith('.apk')) {
+        def file = output.outputFile
+        output.outputFile = new File(file.parent, file.name.replace(".apk", "-" + defaultConfig.versionName + "-" + getDate() + ".apk"))
+      }
+    }
   }
 
   signingConfigs {
@@ -265,7 +269,7 @@ task ndkBuildClean(type:Exec, description: 'Clean native libraries') {
   commandLine NDK_BUILD, 'clean'
 }
 
-tasks.withType(Compile) { compileTask ->
+tasks.withType(JavaCompile) { compileTask ->
   if (compileTask.name.contains('Release') || compileTask.name.contains('Beta')) {
     compileTask.dependsOn ndkBuildRelease
   } else {
diff --git a/android/gradle.properties b/android/gradle.properties
index 847c3e527c..6171287506 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -5,5 +5,6 @@ propVersionCode=331
 propVersionName=3.3.1
 propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1
 propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1
-propAndroidSupportLibrary=com.android.support:support-v4:20.0.+
-propGooglePlayServices=com.google.android.gms:play-services:5.0.89
+propAndroidSupportLibrary=com.android.support:support-v4:+
+propGooglePlayServices=com.google.android.gms:play-services:+
+propGradleAndroidPlugin=com.android.tools.build:gradle:0.13.+
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
index 3c7abdf127..3d0dee6e8e 100644
Binary files a/android/gradle/wrapper/gradle-wrapper.jar and b/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index e37d7d1af7..f373e54507 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jun 16 22:45:43 HST 2014
+#Tue Oct 21 17:06:20 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip