Merge branch 'master' into release

Author: petekanev

.gitignore

@@ -10,6 +10,9 @@ dist/
 local.properties
 
 gen/
+scratch/
 obj/
 bin/
 .svn/
+
+**/.vscode/

.travis.yml

@@ -15,7 +15,7 @@ android:
   components:
   - platform-tools
   - tools
-  - build-tools-23.0.3
+  - build-tools-25.0.2
   - android-23
   - extra-android-support
   - extra-android-m2repository

README.md

@@ -24,7 +24,7 @@ The source in this repo is organized in Android Studio projects.
 * Install Android API Level 22 from Android Studio -> Tools -> Android -> SDK Manager
 * Install the Android NDK from Android Studio -> Tools -> Android -> SDK Manager
 * Download Android Support Repository through the Android SDK Manager
-* Download Build Tools 22 through the Android SDK Manager.
+* Download Build Tools 25.0.2 through the Android SDK Manager.
 
 # How to build