Merge branch 'develop'

Author: jamie-beardedhen

build.gradle

@@ -1,7 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
+
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.2.3'
@@ -12,7 +13,7 @@ allprojects {
     version = VERSION_NAME
     group = GROUP
     repositories {
-        mavenCentral()
+        jcenter()
         maven {
             url "https://jitpack.io" // for snapshot debugging
         }

circle.yml

@@ -0,0 +1,16 @@
+dependencies:
+  pre:
+    # Android SDK Platform 25
+    - if [ ! -d "/usr/local/android-sdk-linux/platforms/android-25" ]; then echo y | android update sdk --no-ui --all --filter "android-25"; fi
+    # Android SDK Build-tools, revision 25.0.1
+    - if [ ! -d "/usr/local/android-sdk-linux/build-tools/25.0.1" ]; then echo y | android update sdk --no-ui --all --filter "build-tools-25.0.1"; fi
+    # Android Support Library, revision 25.0.1
+    - if [ ! -d "/usr/local/android-sdk-linux/extras/android/m2repository/com/android/support/support-v4/25.0.1" ]; then echo y | android update sdk --no-ui --all --filter "extra-android-m2repository"; fi
+    # Android Support Annotations Library, revision 25.0.1
+    - if [ ! -d "/usr/local/android-sdk-linux/extras/android/m2repository/com/android/support/support-annotations/25.0.1" ]; then echo y | android update sdk --no-ui --all --filter "extra-android-m2repository"; fi
+
+  cache_directories:
+    - /usr/local/android-sdk-linux/platforms/android-25
+    - /usr/local/android-sdk-linux/build-tools/25.0.1
+    - /usr/local/android-sdk-linux/extras/android/m2repository/com/android/support/support-v4/25.0.1
+    - /usr/local/android-sdk-linux/extras/android/m2repository/com/android/support/support-annotations/25.0.1