Merge branch 'master' into master

Author: darkal

.travis.yml

@@ -7,7 +7,7 @@ android:
   components:
     - build-tools-27.0.3
     - android-23
-    - sys-img-armeabi-v7a-android-22
+    - sys-img-armeabi-v7a-android-23
     - android-27
     - extra-android-m2repository
     - extra-android-support
@@ -25,4 +25,4 @@ before_script:
     - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
     - emulator -avd test -no-audio -no-window &
     - android-wait-for-emulator
-    - adb shell input keyevent 82 &
+    - adb shell input keyevent 82 &

gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

gradle/warpper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip