diff --git a/.idea/libraries/commons_net_3_3.xml b/.idea/libraries/byte_buddy_0_6_11.xml
similarity index 50%
rename from .idea/libraries/commons_net_3_3.xml
rename to .idea/libraries/byte_buddy_0_6_11.xml
index b869b3f..d25907e 100644
--- a/.idea/libraries/commons_net_3_3.xml
+++ b/.idea/libraries/byte_buddy_0_6_11.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
-  <library name="commons-net-3.3">
+  <library name="byte-buddy-0.6.11">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.3/cd0d5510908225f76c5fe5a3f1df4fa44866f81e/commons-net-3.3.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy/0.6.11/4ef3f3ad5127a5df8dd6483396186b735874fe44/byte-buddy-0.6.11.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.3/ccfa0721eae567b3c47cfaf3cca20e2491362bf6/commons-net-3.3-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy/0.6.11/f777032b8641f339dc4e865d65505da860cabcd4/byte-buddy-0.6.11-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/byte_buddy_0_6_8.xml b/.idea/libraries/byte_buddy_0_6_8.xml
deleted file mode 100644
index 33b9689..0000000
--- a/.idea/libraries/byte_buddy_0_6_8.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="byte-buddy-0.6.8">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy/0.6.8/1cb5e8b6f4dddb61be36965fe3c7239c0311e727/byte-buddy-0.6.8.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy/0.6.8/85f922cfa3f9275cd8a5992c491391bc7e0f8e4a/byte-buddy-0.6.8-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/commons_codec_1_6.xml b/.idea/libraries/commons_codec_1_6.xml
deleted file mode 100644
index 0f7f614..0000000
--- a/.idea/libraries/commons_codec_1_6.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-codec-1.6">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/b7f0fc8f61ecadeb3695f0b9464755eee44374d4/commons-codec-1.6.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/61e9f9d11fe3e12ec62f633006e99d75fd7f19c8/commons-codec-1.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/commons_compress_1_7.xml b/.idea/libraries/commons_compress_1_7.xml
deleted file mode 100644
index 198d5a7..0000000
--- a/.idea/libraries/commons_compress_1_7.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-compress-1.7">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.7/ab365c96ee9bc88adcc6fa40d185c8e15a31410d/commons-compress-1.7.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.7/8b080f4c0bfc9977093412376e2d300512a5981/commons-compress-1.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/commons_logging_1_1_3.xml b/.idea/libraries/commons_logging_1_1_3.xml
deleted file mode 100644
index 5456415..0000000
--- a/.idea/libraries/commons_logging_1_1_3.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-logging-1.1.3">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f/commons-logging-1.1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/28bb0405fddaf04f15058fbfbe01fe2780d7d3b6/commons-logging-1.1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/dagger_1_2_2.xml b/.idea/libraries/dagger_1_2_2.xml
deleted file mode 100644
index e7519f3..0000000
--- a/.idea/libraries/dagger_1_2_2.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="dagger-1.2.2">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.dagger/dagger/1.2.2/e8f912ee19ad84958510883ea191135276b091f8/dagger-1.2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.dagger/dagger/1.2.2/fa37978a975da5ca71034b2a8d3818961c5c8399/dagger-1.2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/dagger_2_1_SNAPSHOT.xml b/.idea/libraries/dagger_2_1_SNAPSHOT.xml
new file mode 100644
index 0000000..c890852
--- /dev/null
+++ b/.idea/libraries/dagger_2_1_SNAPSHOT.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="dagger-2.1-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.dagger/dagger/2.1-SNAPSHOT/eea9428d19e0d205df9f4d065feb3c06a25a24b2/dagger-2.1-SNAPSHOT.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.dagger/dagger/2.1-SNAPSHOT/cffff056ae36beb12c4b8f777e90bc851cf430b8/dagger-2.1-SNAPSHOT-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/dagger_compiler_1_2_2.xml b/.idea/libraries/dagger_compiler_1_2_2.xml
deleted file mode 100644
index 8ec3c86..0000000
--- a/.idea/libraries/dagger_compiler_1_2_2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="dagger-compiler-1.2.2">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.dagger/dagger-compiler/1.2.2/fa9b2f9ae597cedf2a66ef3e60662ff36bb60e57/dagger-compiler-1.2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/esperandro_2_2_0.xml b/.idea/libraries/esperandro_2_2_0.xml
deleted file mode 100644
index f344b38..0000000
--- a/.idea/libraries/esperandro_2_2_0.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="esperandro-2.2.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/de.devland.esperandro/esperandro/2.2.0/500ed092b6320bb25f84ebb76d1f3bf99a79062b/esperandro-2.2.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/guava_15_0.xml b/.idea/libraries/guava_15_0.xml
deleted file mode 100644
index dae8be1..0000000
--- a/.idea/libraries/guava_15_0.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="guava-15.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/15.0/ed727a8d9f247e2050281cb083f1c77b09dcb5cd/guava-15.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/httpclient_4_3_2.xml b/.idea/libraries/httpclient_4_3_2.xml
deleted file mode 100644
index 23fe2c7..0000000
--- a/.idea/libraries/httpclient_4_3_2.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="httpclient-4.3.2">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.2/10a45d03873baa34436ae54548d9f1140d4bb68a/httpclient-4.3.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.2/b2ee1f7676394469864f3350c34dceb2214cd372/httpclient-4.3.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/httpcore_4_3_2.xml b/.idea/libraries/httpcore_4_3_2.xml
deleted file mode 100644
index 69f65f0..0000000
--- a/.idea/libraries/httpcore_4_3_2.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="httpcore-4.3.2">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.3.2/31fbbff1ddbf98f3aa7377c94d33b0447c646b6e/httpcore-4.3.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.3.2/4809f38359edeea9487f747e09aa58ec8d3a54c5/httpcore-4.3.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/javawriter_2_5_1.xml b/.idea/libraries/javawriter_2_5_1.xml
deleted file mode 100644
index 3ca07ae..0000000
--- a/.idea/libraries/javawriter_2_5_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="javawriter-2.5.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.5.1/54c87b3d91238e5b58e1a436d4916eee680ec959/javawriter-2.5.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/annotations_4_1_1_4.xml b/.idea/libraries/javax_annotation_api_1_2.xml
similarity index 52%
rename from .idea/libraries/annotations_4_1_1_4.xml
rename to .idea/libraries/javax_annotation_api_1_2.xml
index f924ac6..811e73f 100644
--- a/.idea/libraries/annotations_4_1_1_4.xml
+++ b/.idea/libraries/javax_annotation_api_1_2.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
-  <library name="annotations-4.1.1.4">
+  <library name="javax.annotation-api-1.2">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android/annotations/4.1.1.4/a1678ba907bf92691d879fef34e1a187038f9259/annotations-4.1.1.4.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.annotation/javax.annotation-api/1.2/479c1e06db31c432330183f5cae684163f186146/javax.annotation-api-1.2.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/jdom2_2_0_5.xml b/.idea/libraries/jdom2_2_0_5.xml
deleted file mode 100644
index 5846107..0000000
--- a/.idea/libraries/jdom2_2_0_5.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="jdom2-2.0.5">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.5/2001db51c131e555bafdb77fc52af6a9408c505e/jdom2-2.0.5.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.5/769f3cca4ce92088288be3d0238ef96ef787e82f/jdom2-2.0.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/jsword_minimalbible_jsword.xml b/.idea/libraries/jsword_minimalbible_jsword.xml
new file mode 100644
index 0000000..0afce95
--- /dev/null
+++ b/.idea/libraries/jsword_minimalbible_jsword.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="jsword-minimalbible.jsword">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/jsword-minimalbible/distribution/jsword.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/jsword_minimalbible_jsword_minimalbible_1_0_SNAPSHOT.xml b/.idea/libraries/jsword_minimalbible_jsword_minimalbible_1_0_SNAPSHOT.xml
deleted file mode 100644
index 54db2d8..0000000
--- a/.idea/libraries/jsword_minimalbible_jsword_minimalbible_1_0_SNAPSHOT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="jsword-minimalbible.jsword-minimalbible-1.0-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/jsword-minimalbible/build/libs/jsword-minimalbible-1.0-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/junit_4_11.xml b/.idea/libraries/junit_4_11.xml
deleted file mode 100644
index 40820ce..0000000
--- a/.idea/libraries/junit_4_11.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="junit-4.11">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.11/4e031bb61df09069aeb2bffb4019e7a5034a4ee0/junit-4.11.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.11/28e0ad201304e4a4abf999ca0570b7cffc352c3c/junit-4.11-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/lucene_analyzers_3_0_3.xml b/.idea/libraries/lucene_analyzers_3_0_3.xml
deleted file mode 100644
index b74683d..0000000
--- a/.idea/libraries/lucene_analyzers_3_0_3.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="lucene-analyzers-3.0.3">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-analyzers/3.0.3/9fd07cce890dd18bdd2616b5fb5e6f10d55b819e/lucene-analyzers-3.0.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-analyzers/3.0.3/b18bfcfabcb35e3e95dccd3498c2d6a5aa49f469/lucene-analyzers-3.0.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/lucene_core_3_0_3.xml b/.idea/libraries/lucene_core_3_0_3.xml
deleted file mode 100644
index 0b0d95d..0000000
--- a/.idea/libraries/lucene_core_3_0_3.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="lucene-core-3.0.3">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-core/3.0.3/335f7ea0e28a4a1358aa745f4bd2037e8afe44fc/lucene-core-3.0.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-core/3.0.3/d3b608052205d068ddccbffd9fd5e24fdd438060/lucene-core-3.0.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/lucene_smartcn_3_0_3.xml b/.idea/libraries/lucene_smartcn_3_0_3.xml
deleted file mode 100644
index eb78047..0000000
--- a/.idea/libraries/lucene_smartcn_3_0_3.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="lucene-smartcn-3.0.3">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-smartcn/3.0.3/97ebddd027f8f7bc51eab43d0c204be699c8694/lucene-smartcn-3.0.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-smartcn/3.0.3/adb22a6f574633fff215d0f1273648f731d5df9d/lucene-smartcn-3.0.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/lucene_snowball_3_0_3.xml b/.idea/libraries/lucene_snowball_3_0_3.xml
deleted file mode 100644
index ce25f86..0000000
--- a/.idea/libraries/lucene_snowball_3_0_3.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="lucene-snowball-3.0.3">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-snowball/3.0.3/e0c15cc6929e29cc7908246cc8e2c906ff2c1cc6/lucene-snowball-3.0.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-snowball/3.0.3/7e8fa7f20dd96f1aacc3c170ead9d0efc4b32c67/lucene-snowball-3.0.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/mockito_core_2_0_14_beta.xml b/.idea/libraries/mockito_core_2_0_14_beta.xml
deleted file mode 100644
index 3491005..0000000
--- a/.idea/libraries/mockito_core_2_0_14_beta.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="mockito-core-2.0.14-beta">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.mockito/mockito-core/2.0.14-beta/d2327fbe166e3f7f9486f328a707326e2ed1da03/mockito-core-2.0.14-beta.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.mockito/mockito-core/2.0.14-beta/8faf7f5b2722187768e2de41d2a893305f360a3e/mockito-core-2.0.14-beta-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/mockito_core_2_0_23_beta.xml b/.idea/libraries/mockito_core_2_0_23_beta.xml
new file mode 100644
index 0000000..a8c2c79
--- /dev/null
+++ b/.idea/libraries/mockito_core_2_0_23_beta.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="mockito-core-2.0.23-beta">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.mockito/mockito-core/2.0.23-beta/f8a8258fa24b3c418766169cccf937ddecf97600/mockito-core-2.0.23-beta.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.mockito/mockito-core/2.0.23-beta/1a867de9aa68a0e2599a4d12f39fd189bec32c43/mockito-core-2.0.23-beta-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/slf4j_api_1_7_6.xml b/.idea/libraries/slf4j_api_1_7_6.xml
deleted file mode 100644
index b568311..0000000
--- a/.idea/libraries/slf4j_api_1_7_6.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="slf4j-api-1.7.6">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.6/562424e36df3d2327e8e9301a76027fca17d54ea/slf4j-api-1.7.6.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.6/97bb93c1badeae97a3d37e3c902df2985ee3de34/slf4j-api-1.7.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/xz_1_4.xml b/.idea/libraries/xz_1_4.xml
deleted file mode 100644
index 4a337e5..0000000
--- a/.idea/libraries/xz_1_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="xz-1.4">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.tukaani/xz/1.4/18a9a2ce6abf32ea1b5fd31dae5210ad93f4e5e3/xz-1.4.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.tukaani/xz/1.4/4627f50e8fedcd2002f7ace1cfa1a1eea0ab631a/xz-1.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b36c807..389002b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -33,6 +33,30 @@
     <option name="excludeFilter" value="" />
   </component>
   <component name="IdProvider" IDEtalkID="15F212A1B560F3382F7D6643192A3A39" />
+  <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="PDMPlugin">
     <option name="options">
       <map>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..7f68460
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/MinimalBible.iml b/MinimalBible.iml
index fb297e3..8b43689 100644
--- a/MinimalBible.iml
+++ b/MinimalBible.iml
@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
diff --git a/jsword-minimalbible b/jsword-minimalbible
index 93dfa15..98c2554 160000
--- a/jsword-minimalbible
+++ b/jsword-minimalbible
@@ -1 +1 @@
-Subproject commit 93dfa15fa55ba9a33765937f22d0b0fe0a64945e
+Subproject commit 98c2554127557992d45acd094a6db82f73adcb7a