diff --git a/build.gradle b/build.gradle
index 47d16c12fed..50e7bfa9014 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath "com.android.tools.build:gradle:2.0.0-alpha3"
     }
 }
 
@@ -26,7 +26,7 @@ allprojects {
 // dependency versions for all sub modules
 ext {
     // regular
-    buildTools = "22.0.1"
+    buildTools = "23.0.2"
     compileSdk = 22
     minSdk = 14
     targetSdk = 22
@@ -34,6 +34,8 @@ ext {
     support = "22.1.1"
     play_services = "7.3.0"
 
+    license_dialog = "1.7.0"
+
     // testing - jvm
     junit = "4.12"
     mockito = "1.9.5"
diff --git a/configuration/buildAndUpdateProduct.sh b/configuration/buildAndUpdateProduct.sh
index 3c3fcc0d0a0..1adf2bf905e 100755
--- a/configuration/buildAndUpdateProduct.sh
+++ b/configuration/buildAndUpdateProduct.sh
@@ -637,7 +637,7 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
         extra="$extra -Dbuoy-app-version=$BUOY_APP_VERSION"
 
         NOW=$(date +"%s")
-        BUILD_TOOLS=22.0.1
+        BUILD_TOOLS=23.0.2
         TARGET_API=22
         TEST_API=18
         ANDROID_ABI=armeabi-v7a
diff --git a/mobile/com.sap.sailing.android.shared/build.gradle b/mobile/com.sap.sailing.android.shared/build.gradle
index 9e42b90d0a3..8688b6c0633 100644
--- a/mobile/com.sap.sailing.android.shared/build.gradle
+++ b/mobile/com.sap.sailing.android.shared/build.gradle
@@ -52,7 +52,7 @@ dependencies {
     compile "com.google.android.gms:play-services-location:${rootProject.ext.play_services}"
 
     /* licence dialog */
-    compile('de.psdev.licensesdialog:licensesdialog:1.8.0')
+    compile("de.psdev.licensesdialog:licensesdialog:${rootProject.ext.license_dialog}")
 
     /* all local jar-libs */
     compile fileTree(dir: "libs", include: ["*.jar"])
diff --git a/mobile/com.sap.sailing.android.shared/pom.xml b/mobile/com.sap.sailing.android.shared/pom.xml
index 637b0c02458..5f177808b72 100644
--- a/mobile/com.sap.sailing.android.shared/pom.xml
+++ b/mobile/com.sap.sailing.android.shared/pom.xml
@@ -90,7 +90,7 @@
         <dependency>
     		<groupId>de.psdev.licensesdialog</groupId>
     		<artifactId>licensesdialog</artifactId>
-    		<version>1.8.0</version>
+    		<version>1.7.0</version>
     		<type>aar</type>
 		</dependency>
     </dependencies>
diff --git a/mobile/com.sap.sailing.android.tracking.app/build.gradle b/mobile/com.sap.sailing.android.tracking.app/build.gradle
index d98a6920b7e..6ab855a8544 100644
--- a/mobile/com.sap.sailing.android.tracking.app/build.gradle
+++ b/mobile/com.sap.sailing.android.tracking.app/build.gradle
@@ -76,7 +76,7 @@ dependencies {
     compile "com.google.android.gms:play-services-location:${rootProject.ext.play_services}"
 
     /* licence dialog */
-    compile('de.psdev.licensesdialog:licensesdialog:1.8.0')
+    compile("de.psdev.licensesdialog:licensesdialog:${rootProject.ext.license_dialog}")
 
     /* local dependencies */
     compile project(":mobile:com.sap.sailing.android.shared")
@@ -85,16 +85,16 @@ dependencies {
     testCompile "junit:junit:${rootProject.ext.junit}"
     testCompile "org.mockito:mockito-core:${rootProject.ext.mockito}"
 
-    /* UI testing with espresso */
-    androidTestCompile "com.android.support:support-annotations:${rootProject.ext.support}"
-    androidTestCompile "com.android.support.test:runner:${rootProject.ext.test}"
-    androidTestCompile "com.android.support.test:rules:${rootProject.ext.test}"
-    androidTestCompile "com.android.support.test.espresso:espresso-core:${rootProject.ext.espresso}"
-    androidTestCompile ("com.android.support.test.espresso:espresso-contrib:${rootProject.ext.espresso}") {
-        exclude group: "com.android.support", module: "appcompat"
-        exclude group: "com.android.support", module: "support-v4"
-        exclude module: "recyclerview-v7"
-    }
+//    /* UI testing with espresso */
+//    androidTestCompile "com.android.support:support-annotations:${rootProject.ext.support}"
+//    androidTestCompile "com.android.support.test:runner:${rootProject.ext.test}"
+//    androidTestCompile "com.android.support.test:rules:${rootProject.ext.test}"
+//    androidTestCompile "com.android.support.test.espresso:espresso-core:${rootProject.ext.espresso}"
+//    androidTestCompile ("com.android.support.test.espresso:espresso-contrib:${rootProject.ext.espresso}") {
+//        exclude group: "com.android.support", module: "appcompat"
+//        exclude group: "com.android.support", module: "support-v4"
+//        exclude module: "recyclerview-v7"
+//    }
 }
 
 // Custom tasks
diff --git a/mobile/com.sap.sailing.android.tracking.app/pom.xml b/mobile/com.sap.sailing.android.tracking.app/pom.xml
index ba5af9f4234..b1a09dd3997 100644
--- a/mobile/com.sap.sailing.android.tracking.app/pom.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/pom.xml
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>de.psdev.licensesdialog</groupId>
             <artifactId>licensesdialog</artifactId>
-            <version>1.8.0</version>
+            <version>1.7.0</version>
             <type>aar</type>
         </dependency>
     </dependencies>
diff --git a/mobile/com.sap.sailing.buoy.positioning/build.gradle b/mobile/com.sap.sailing.buoy.positioning/build.gradle
index 49dce8e1d86..ea9b08f4f89 100644
--- a/mobile/com.sap.sailing.buoy.positioning/build.gradle
+++ b/mobile/com.sap.sailing.buoy.positioning/build.gradle
@@ -75,7 +75,7 @@ dependencies {
     compile "com.google.android.gms:play-services-location:${rootProject.ext.play_services}"
 
     /* licence dialog */
-    compile('de.psdev.licensesdialog:licensesdialog:1.8.0')
+    compile("de.psdev.licensesdialog:licensesdialog:${rootProject.ext.license_dialog}")
 
     /* local dependencies */
     compile project(":mobile:com.sap.sailing.android.shared")
@@ -84,17 +84,16 @@ dependencies {
     testCompile "junit:junit:${rootProject.ext.junit}"
     testCompile "org.mockito:mockito-core:${rootProject.ext.mockito}"
 
-    /* UI testing with espresso */
-
-    androidTestCompile "com.android.support:support-annotations:${rootProject.ext.support}"
-    androidTestCompile "com.android.support.test:runner:${rootProject.ext.test}"
-    androidTestCompile "com.android.support.test:rules:${rootProject.ext.test}"
-    androidTestCompile "com.android.support.test.espresso:espresso-core:${rootProject.ext.espresso}"
-    androidTestCompile ("com.android.support.test.espresso:espresso-contrib:${rootProject.ext.espresso}") {
-        exclude group: "com.android.support", module: "appcompat"
-        exclude group: "com.android.support", module: "support-v4"
-        exclude module: "recyclerview-v7"
-    }
+//    /* UI testing with espresso */
+//    androidTestCompile "com.android.support:support-annotations:${rootProject.ext.support}"
+//    androidTestCompile "com.android.support.test:runner:${rootProject.ext.test}"
+//    androidTestCompile "com.android.support.test:rules:${rootProject.ext.test}"
+//    androidTestCompile "com.android.support.test.espresso:espresso-core:${rootProject.ext.espresso}"
+//    androidTestCompile ("com.android.support.test.espresso:espresso-contrib:${rootProject.ext.espresso}") {
+//        exclude group: "com.android.support", module: "appcompat"
+//        exclude group: "com.android.support", module: "support-v4"
+//        exclude module: "recyclerview-v7"
+//    }
 }
 
 // Custom tasks
diff --git a/mobile/com.sap.sailing.buoy.positioning/pom.xml b/mobile/com.sap.sailing.buoy.positioning/pom.xml
index 22387a73b9f..3ac8b381969 100644
--- a/mobile/com.sap.sailing.buoy.positioning/pom.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/pom.xml
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>de.psdev.licensesdialog</groupId>
             <artifactId>licensesdialog</artifactId>
-            <version>1.8.0</version>
+            <version>1.7.0</version>
             <type>aar</type>
         </dependency>
 
diff --git a/mobile/com.sap.sailing.racecommittee.app/build.gradle b/mobile/com.sap.sailing.racecommittee.app/build.gradle
index 2ea826365b3..8a0d1366c6b 100644
--- a/mobile/com.sap.sailing.racecommittee.app/build.gradle
+++ b/mobile/com.sap.sailing.racecommittee.app/build.gradle
@@ -82,7 +82,7 @@ dependencies {
     compile "com.google.android.gms:play-services-location:${rootProject.ext.play_services}"
 
     /* licence dialog */
-    compile('de.psdev.licensesdialog:licensesdialog:1.8.0')
+    compile("de.psdev.licensesdialog:licensesdialog:${rootProject.ext.license_dialog}")
 
     /* local dependencies */
     compile project(":mobile:com.sap.sailing.android.shared")
@@ -95,16 +95,16 @@ dependencies {
     testCompile "junit:junit:${rootProject.ext.junit}"
     testCompile "org.mockito:mockito-core:${rootProject.ext.mockito}"
 
-    /* UI testing with espresso */
-    androidTestCompile "com.android.support:support-annotations:${rootProject.ext.support}"
-    androidTestCompile "com.android.support.test:runner:${rootProject.ext.test}"
-    androidTestCompile "com.android.support.test:rules:${rootProject.ext.test}"
-    androidTestCompile "com.android.support.test.espresso:espresso-core:${rootProject.ext.espresso}"
-    androidTestCompile ("com.android.support.test.espresso:espresso-contrib:${rootProject.ext.espresso}") {
-        exclude group: "com.android.support", module: "appcompat"
-        exclude group: "com.android.support", module: "support-v4"
-        exclude module: "recyclerview-v7"
-    }
+//    /* UI testing with espresso */
+//    androidTestCompile "com.android.support:support-annotations:${rootProject.ext.support}"
+//    androidTestCompile "com.android.support.test:runner:${rootProject.ext.test}"
+//    androidTestCompile "com.android.support.test:rules:${rootProject.ext.test}"
+//    androidTestCompile "com.android.support.test.espresso:espresso-core:${rootProject.ext.espresso}"
+//    androidTestCompile ("com.android.support.test.espresso:espresso-contrib:${rootProject.ext.espresso}") {
+//        exclude group: "com.android.support", module: "appcompat"
+//        exclude group: "com.android.support", module: "support-v4"
+//        exclude module: "recyclerview-v7"
+//    }
 }
 
 // Custom tasks
diff --git a/mobile/com.sap.sailing.racecommittee.app/pom.xml b/mobile/com.sap.sailing.racecommittee.app/pom.xml
index 88f254d6538..84f6d4f312f 100644
--- a/mobile/com.sap.sailing.racecommittee.app/pom.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/pom.xml
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>de.psdev.licensesdialog</groupId>
             <artifactId>licensesdialog</artifactId>
-            <version>1.8.0</version>
+            <version>1.7.0</version>
             <type>aar</type>
         </dependency>
     </dependencies>