diff --git a/app/app.iml b/app/app.iml
index d01f501f..a3cc35fa 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -42,12 +42,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/allDebug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/allDebug/renderscript" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/allDebug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/all/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/all/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/assets" type="java-test-resource" />
@@ -56,6 +50,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/all/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/all/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/assets" type="java-resource" />
@@ -64,14 +64,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/all/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/renderscript" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/assets" type="java-test-resource" />
@@ -80,6 +72,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
diff --git a/app/build.gradle b/app/build.gradle
index 0171db31..91a68bf5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ model {
             applicationId = "eu.faircode.netguard"
             minSdkVersion.apiLevel = 14
             targetSdkVersion.apiLevel = 24
-            versionCode = 2016071302
-            versionName = "2.35"
+            versionCode = 2016071401
+            versionName = "2.36"
             archivesBaseName = "NetGuard-v$versionName-$versionCode-sdk-$targetSdkVersion.apiLevel"
 
             buildConfigFields {