Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram

android/Pictogrammar/app/build.gradle

@@ -48,14 +48,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    //compile fileTree(dir: 'E:\\Users\\Fernando\\Google Drive\\experimentos\\Pictogrammar\\android\\app\\libs', include: ['*.jar'])
-    compile 'com.google.android.gms:play-services:8.4.0'
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.github.nkzawa:socket.io-client:0.5.0'
-    compile 'com.koushikdutta.async:androidasync:2.+'
-    compile 'com.android.support:support-v4:23.1.1'
-    compile 'com.google.android.gms:play-services-ads:8.4.0'
-    compile 'com.google.android.gms:play-services-identity:8.4.0'
-    compile 'com.google.android.gms:play-services-gcm:8.4.0'
+        compile fileTree(dir: 'libs', include: ['*.jar'])
+        //compile fileTree(dir: 'E:\\Users\\Fernando\\Google Drive\\experimentos\\Pictogrammar\\android\\app\\libs', include: ['*.jar'])
+        compile 'com.google.android.gms:play-services:6.5.87'
+        compile 'com.android.support:appcompat-v7:21.0.3'
+        compile 'com.github.nkzawa:socket.io-client:0.5.0'
+        compile 'com.koushikdutta.async:androidasync:2.+'
+        compile 'com.android.support:support-v4:21.0.+'
 }