diff --git a/.travis.yml b/.travis.yml
index 30fb18a..fbfa055 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ jdk:
 android:
   components:
     - android-24
-    - build-tools-24.0.0
+    - build-tools-24.0.3
     - extra-android-m2repository
     - platform-tools
     - tools
@@ -33,7 +33,7 @@ before_cache:
   - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
 
 before_install:
-  - echo y | android update sdk --all --no-ui --force --filter build-tools-24.0.0
+  - echo y | android update sdk --all --no-ui --force --filter build-tools-24.0.3
   - echo y | android update sdk --all --no-ui --force --filter android-24
 
 script:
@@ -48,3 +48,4 @@ cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
+    - $HOME/.m2/
diff --git a/app/build.gradle b/app/build.gradle
index b2c8e24..48761dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,6 +12,7 @@ android {
 		targetSdkVersion rootProject.ext.targetSdkVersion
 		versionCode 1
 		versionName '1.0'
+		resConfigs rootProject.ext.supportedLocales
 	}
 
 	buildTypes {
diff --git a/build.gradle b/build.gradle
index 7c64f5f..c45c9ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 	}
 
 	dependencies {
-		classpath 'com.android.tools.build:gradle:2.2.0'
+		classpath 'com.android.tools.build:gradle:2.2.1'
 		classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 		classpath 'io.realm:realm-gradle-plugin:1.0.1'
 		classpath 'org.jacoco:org.jacoco.core:0.7.7.201606060606'
@@ -26,16 +26,17 @@ task clean(type: Delete) {
 }
 
 ext {
-	buildToolsVersion = '24.0.2'
+	buildToolsVersion = '24.0.3'
 	compileSdkVersion = 24
 	minSdkVersion = 9
 	targetSdkVersion = 24
+	supportedLocales = ['en', 'fr']
 
 	// Dependencies version
 	jUnitVersion = '4.12'
 	kolumbusVersionCode = 9
 	kolumbusVersionName = '0.9'
 	kotlinVersion = '1.0.4'
-	mockitoVersion = '2.2.0-beta.1'
+	mockitoVersion = '2.2.2'
 	supportLibraryVersion = '24.2.1'
 }
diff --git a/gradle.properties b/gradle.properties
index 1d3591c..c866d89 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,5 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+kotlin.incremental=true
diff --git a/kolumbus-no-op/build.gradle b/kolumbus-no-op/build.gradle
index fa0f7a0..17f9557 100644
--- a/kolumbus-no-op/build.gradle
+++ b/kolumbus-no-op/build.gradle
@@ -15,6 +15,7 @@ android {
 		targetSdkVersion rootProject.ext.targetSdkVersion
 		versionCode rootProject.ext.kolumbusVersionCode
 		versionName rootProject.ext.kolumbusVersionName
+		resConfigs rootProject.ext.supportedLocales
 	}
 
 	buildTypes {
diff --git a/kolumbus/build.gradle b/kolumbus/build.gradle
index eaf8866..27261d8 100644
--- a/kolumbus/build.gradle
+++ b/kolumbus/build.gradle
@@ -17,7 +17,7 @@ android {
 		targetSdkVersion rootProject.ext.targetSdkVersion
 		versionCode rootProject.ext.kolumbusVersionCode
 		versionName rootProject.ext.kolumbusVersionName
-		resConfigs 'en', 'fr'
+		resConfigs rootProject.ext.supportedLocales
 		vectorDrawables.useSupportLibrary = true
 	}