Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties

build.gradle

@@ -7,7 +7,6 @@ buildscript {
         classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }
-
 allprojects {
     repositories {
         jcenter()

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Mar 29 13:48:07 CST 2016
+#Tue Mar 29 15:27:01 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip