diff --git a/src/java/JavaFileStorage/.idea/gradle.xml b/src/java/JavaFileStorage/.idea/gradle.xml
index 3ed2e6cb..bb3e95cb 100644
--- a/src/java/JavaFileStorage/.idea/gradle.xml
+++ b/src/java/JavaFileStorage/.idea/gradle.xml
@@ -13,6 +13,12 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="myModules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/src/java/JavaFileStorage/.idea/libraries/1_commons_logging_1_1_1.xml b/src/java/JavaFileStorage/.idea/libraries/1_commons_logging_1_1_1.xml
deleted file mode 100644
index bae06560..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/1_commons_logging_1_1_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="1_commons-logging-1.1.1">
-    <CLASSES>
-      <root url="jar://$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/1_httpcore_4_0_1.xml b/src/java/JavaFileStorage/.idea/libraries/1_httpcore_4_0_1.xml
deleted file mode 100644
index ac99a181..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/1_httpcore_4_0_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="1_httpcore-4.0.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.0.1/e813b8722c387b22e1adccf7914729db09bcb4a9/httpcore-4.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.0.1/69febd50593a006a4593ef64a697b14208a55b7b/httpcore-4.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/1_jsr305_1_3_9.xml b/src/java/JavaFileStorage/.idea/libraries/1_jsr305_1_3_9.xml
deleted file mode 100644
index b8433971..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/1_jsr305_1_3_9.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="1_jsr305-1.3.9">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/jsr305-1.3.9.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/commons_codec_1_3.xml b/src/java/JavaFileStorage/.idea/libraries/commons_codec_1_3.xml
deleted file mode 100644
index 45be99d4..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/commons_codec_1_3.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-codec-1.3">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.3/fd32786786e2adb664d5ecc965da47629dca14ba/commons-codec-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.3/ee264b5d7a0f939d5999398c7f1ade031db3fcec/commons-codec-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/commons_logging_1_1_1.xml b/src/java/JavaFileStorage/.idea/libraries/commons_logging_1_1_1.xml
deleted file mode 100644
index 53478ef6..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/commons_logging_1_1_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-logging-1.1.1">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/commons-logging-1.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/dropbox_android_sdk_1_6_2.xml b/src/java/JavaFileStorage/.idea/libraries/dropbox_android_sdk_1_6_2.xml
deleted file mode 100644
index a39b58ed..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/dropbox_android_sdk_1_6_2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="dropbox-android-sdk-1.6.2">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/dropbox-android-sdk-1.6.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/google_api_client_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_api_client_1_16_0_rc.xml
deleted file mode 100644
index 806fdeae..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/google_api_client_1_16_0_rc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="google-api-client-1.16.0-rc">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/google-api-client-1.16.0-rc.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/google_api_client_android_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_api_client_android_1_16_0_rc.xml
deleted file mode 100644
index 95c639c4..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/google_api_client_android_1_16_0_rc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="google-api-client-android-1.16.0-rc">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/google-api-client-android-1.16.0-rc.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/google_api_services_drive_v2_rev102_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_api_services_drive_v2_rev102_1_16_0_rc.xml
deleted file mode 100644
index b0aa64f5..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/google_api_services_drive_v2_rev102_1_16_0_rc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="google-api-services-drive-v2-rev102-1.16.0-rc">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/google-api-services-drive-v2-rev102-1.16.0-rc.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/google_http_client_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_http_client_1_16_0_rc.xml
deleted file mode 100644
index 7edb953d..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/google_http_client_1_16_0_rc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="google-http-client-1.16.0-rc">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/google-http-client-1.16.0-rc.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/google_http_client_1_20_0.xml b/src/java/JavaFileStorage/.idea/libraries/google_http_client_1_20_0.xml
deleted file mode 100644
index ef947f60..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/google_http_client_1_20_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="google-http-client-1.20.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.http-client/google-http-client/1.20.0/93d82db2bca534960253f43424b2ba9d7638b4d2/google-http-client-1.20.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.http-client/google-http-client/1.20.0/5140e4d6fc293ede7dee965e8f3426d3e9e3d0c0/google-http-client-1.20.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/google_http_client_android_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_http_client_android_1_16_0_rc.xml
deleted file mode 100644
index 13a9adda..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/google_http_client_android_1_16_0_rc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="google-http-client-android-1.16.0-rc">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/google-http-client-android-1.16.0-rc.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/google_http_client_gson_1_20_0.xml b/src/java/JavaFileStorage/.idea/libraries/google_http_client_gson_1_20_0.xml
deleted file mode 100644
index e1c9063e..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/google_http_client_gson_1_20_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="google-http-client-gson-1.20.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.http-client/google-http-client-gson/1.20.0/9204765f39000f6109c927ac66c7963bf9c7df19/google-http-client-gson-1.20.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.http-client/google-http-client-gson/1.20.0/2d4f1549ea6ee0d12958eca129116399c390ad05/google-http-client-gson-1.20.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/google_http_client_jackson2_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_http_client_jackson2_1_16_0_rc.xml
deleted file mode 100644
index 7f253039..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/google_http_client_jackson2_1_16_0_rc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="google-http-client-jackson2-1.16.0-rc">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/google-http-client-jackson2-1.16.0-rc.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/google_http_client_jackson_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_http_client_jackson_1_16_0_rc.xml
deleted file mode 100644
index 6ef030bc..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/google_http_client_jackson_1_16_0_rc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="google-http-client-jackson-1.16.0-rc">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/google-http-client-jackson-1.16.0-rc.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/google_oauth_client_1_16_0_rc.xml b/src/java/JavaFileStorage/.idea/libraries/google_oauth_client_1_16_0_rc.xml
deleted file mode 100644
index 72a5d3a1..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/google_oauth_client_1_16_0_rc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="google-oauth-client-1.16.0-rc">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/google-oauth-client-1.16.0-rc.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/gson_2_1.xml b/src/java/JavaFileStorage/.idea/libraries/gson_2_1.xml
deleted file mode 100644
index 2ebe839a..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/gson_2_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="gson-2.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.1/2e66da15851f9f5b5079228f856c2f090ba98c38/gson-2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.1/5c2e6207e9abf9a18bde012371a821196dd18e13/gson-2.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/httpclient_4_0_1.xml b/src/java/JavaFileStorage/.idea/libraries/httpclient_4_0_1.xml
deleted file mode 100644
index 4f53d2c9..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/httpclient_4_0_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="httpclient-4.0.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.0.1/1d7d28fa738bdbfe4fbd895d9486308999bdf440/httpclient-4.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.0.1/2480b1ac944ebdd15f5f7b6730e9a151d39f4d88/httpclient-4.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/httpclient_4_0_3.xml b/src/java/JavaFileStorage/.idea/libraries/httpclient_4_0_3.xml
deleted file mode 100644
index b4e875ac..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/httpclient_4_0_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="httpclient-4.0.3">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/httpclient-4.0.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/httpcore_4_0_1.xml b/src/java/JavaFileStorage/.idea/libraries/httpcore_4_0_1.xml
deleted file mode 100644
index e3b32696..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/httpcore_4_0_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="httpcore-4.0.1">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/httpcore-4.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/httpmime_4_0_3.xml b/src/java/JavaFileStorage/.idea/libraries/httpmime_4_0_3.xml
deleted file mode 100644
index a5ecac06..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/httpmime_4_0_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="httpmime-4.0.3">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/httpmime-4.0.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/jackson_core_2_1_3.xml b/src/java/JavaFileStorage/.idea/libraries/jackson_core_2_1_3.xml
deleted file mode 100644
index caaedba7..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/jackson_core_2_1_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="jackson-core-2.1.3">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/jackson-core-2.1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/jackson_core_asl_1_9_11.xml b/src/java/JavaFileStorage/.idea/libraries/jackson_core_asl_1_9_11.xml
deleted file mode 100644
index 5a7e0133..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/jackson_core_asl_1_9_11.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="jackson-core-asl-1.9.11">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/jackson-core-asl-1.9.11.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/json_simple_1_1.xml b/src/java/JavaFileStorage/.idea/libraries/json_simple_1_1.xml
deleted file mode 100644
index c46ba058..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/json_simple_1_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="json_simple-1.1">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/libs/json_simple-1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/libraries/jsr305_1_3_9.xml b/src/java/JavaFileStorage/.idea/libraries/jsr305_1_3_9.xml
deleted file mode 100644
index 52ccf61d..00000000
--- a/src/java/JavaFileStorage/.idea/libraries/jsr305_1_3_9.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="jsr305-1.3.9">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/1.3.9/40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf/jsr305-1.3.9.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/.idea/misc.xml b/src/java/JavaFileStorage/.idea/misc.xml
index e9309050..1a3eaffb 100644
--- a/src/java/JavaFileStorage/.idea/misc.xml
+++ b/src/java/JavaFileStorage/.idea/misc.xml
@@ -3,6 +3,30 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
diff --git a/src/java/JavaFileStorage/app/app.iml b/src/java/JavaFileStorage/app/app.iml
index 889b621b..dab87834 100644
--- a/src/java/JavaFileStorage/app/app.iml
+++ b/src/java/JavaFileStorage/app/app.iml
@@ -12,10 +12,8 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
         <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />