Merge branch 'Fix_PlayServices_update' of https://github.com/rock3r/iosched-2014 into foo

Conflicts:
	Wearable/build.gradle
	android/build.gradle
	build.gradle

Change-Id: Ibc782be67875114498472895a527180a39b4b957

Author: romannurik

Wearable/build.gradle

@@ -66,7 +66,7 @@ android {
 
 dependencies {
     compile 'com.android.support:support-v13:21.+'
-    compile 'com.google.android.support:wearable:+'
+    compile 'com.google.android.support:wearable:1.0.+'
     compile 'com.google.android.gms:play-services-wearable:6.1.+'
 } 
 

android/build.gradle

@@ -96,6 +96,6 @@ dependencies {
     /* The two dependencies below are only required while we are using http
        Drive appdata. When we start using AppData through GMS,
        they should be removed. */
-    compile 'com.google.http-client:google-http-client-gson:+'
+    compile 'com.google.http-client:google-http-client-gson:1.+'
     compile 'com.google.apis:google-api-services-drive:+'
 }