diff --git a/.gitignore b/.gitignore
index 246e7ffff..b588ecd3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,33 @@
.classpath
target/
test-output/
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/encodings.xml
+.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
+.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
+.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
+.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
+.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
+.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml
+.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_4.xml
+.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
+.idea/libraries/Maven__commons_io_commons_io_2_4.xml
+.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml
+*.xml
+.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml
+.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_1.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+*.xml
+.idea/encodings.xml
+.idea/libraries/Maven__commons_io_commons_io_2_4.xml
+.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml
+.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_4.xml
+.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_4.xml
+.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_3_3_v20150827.xml
+.idea/modules.xml
+.idea/modules.xml
+.idea/vcs.xml
+.idea/vcs.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 000000000..eed2d2ad1
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 000000000..e7bedf337
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 000000000..12e5114b5
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml
new file mode 100644
index 000000000..0119075af
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_4.xml
new file mode 100644
index 000000000..072f8ef49
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_4.xml
new file mode 100644
index 000000000..efdcf45c6
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_dagger_dagger_2_0_2.xml b/.idea/libraries/Maven__com_google_dagger_dagger_2_0_2.xml
new file mode 100644
index 000000000..dc7718538
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_dagger_dagger_2_0_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_dagger_dagger_compiler_2_0_2.xml b/.idea/libraries/Maven__com_google_dagger_dagger_compiler_2_0_2.xml
new file mode 100644
index 000000000..755c8428e
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_dagger_dagger_compiler_2_0_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_dagger_dagger_producers_2_0_beta.xml b/.idea/libraries/Maven__com_google_dagger_dagger_producers_2_0_beta.xml
new file mode 100644
index 000000000..d6ba286ef
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_dagger_dagger_producers_2_0_beta.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_guava_19_0.xml b/.idea/libraries/Maven__com_google_guava_guava_19_0.xml
new file mode 100644
index 000000000..68e23ccd0
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_guava_19_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
new file mode 100644
index 000000000..27424a179
--- /dev/null
+++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml
new file mode 100644
index 000000000..66e653715
--- /dev/null
+++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
new file mode 100644
index 000000000..bc2aad0ed
--- /dev/null
+++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml
new file mode 100644
index 000000000..217d6e0a6
--- /dev/null
+++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__de_bechte_junit_junit_hierarchicalcontextrunner_4_12_1.xml b/.idea/libraries/Maven__de_bechte_junit_junit_hierarchicalcontextrunner_4_12_1.xml
new file mode 100644
index 000000000..fc7bbfb57
--- /dev/null
+++ b/.idea/libraries/Maven__de_bechte_junit_junit_hierarchicalcontextrunner_4_12_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml
new file mode 100644
index 000000000..93cf65aba
--- /dev/null
+++ b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml
new file mode 100644
index 000000000..c24f7e308
--- /dev/null
+++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml
new file mode 100644
index 000000000..d41104174
--- /dev/null
+++ b/.idea/libraries/Maven__junit_junit_4_12.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_0.xml
new file mode 100644
index 000000000..28cee2ad0
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml
new file mode 100644
index 000000000..83cba3e35
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_jackrabbit_jackrabbit_webdav_2_11_3.xml b/.idea/libraries/Maven__org_apache_jackrabbit_jackrabbit_webdav_2_11_3.xml
new file mode 100644
index 000000000..033ce2fa8
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_jackrabbit_jackrabbit_webdav_2_11_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_1.xml
new file mode 100644
index 000000000..e0f672a67
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_1.xml
new file mode 100644
index 000000000..28ef981a8
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_1.xml
new file mode 100644
index 000000000..8fd003fd1
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_1.xml
new file mode 100644
index 000000000..f29d4cf82
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_51.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_51.xml
new file mode 100644
index 000000000..e98695efd
--- /dev/null
+++ b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_51.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_cryptomator_siv_mode_1_0_2.xml b/.idea/libraries/Maven__org_cryptomator_siv_mode_1_0_2.xml
new file mode 100644
index 000000000..47a0e55e1
--- /dev/null
+++ b/.idea/libraries/Maven__org_cryptomator_siv_mode_1_0_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_3_3_v20150827.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_3_3_v20150827.xml
new file mode 100644
index 000000000..93b109ca1
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_3_3_v20150827.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_3_3_v20150827.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_3_3_v20150827.xml
new file mode 100644
index 000000000..8c69dcf5f
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_3_3_v20150827.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_3_3_v20150827.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_3_3_v20150827.xml
new file mode 100644
index 000000000..4cf050308
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_3_3_v20150827.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_3_3_v20150827.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_3_3_v20150827.xml
new file mode 100644
index 000000000..612378240
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_3_3_v20150827.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_3_3_v20150827.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_3_3_v20150827.xml
new file mode 100644
index 000000000..7b61d22e6
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_3_3_v20150827.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_3_3_v20150827.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_3_3_v20150827.xml
new file mode 100644
index 000000000..c9f69fbd8
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_3_3_v20150827.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_3_3_v20150827.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_3_3_v20150827.xml
new file mode 100644
index 000000000..426532bfe
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_3_3_v20150827.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_3_3_v20150827.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_3_3_v20150827.xml
new file mode 100644
index 000000000..154177b6c
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_3_3_v20150827.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_fxmisc_easybind_easybind_1_0_3.xml b/.idea/libraries/Maven__org_fxmisc_easybind_easybind_1_0_3.xml
new file mode 100644
index 000000000..8a8cd14e7
--- /dev/null
+++ b/.idea/libraries/Maven__org_fxmisc_easybind_easybind_1_0_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml
new file mode 100644
index 000000000..56193163f
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml
new file mode 100644
index 000000000..a5237036c
--- /dev/null
+++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml
new file mode 100644
index 000000000..7ab319b64
--- /dev/null
+++ b/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_4.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_4.xml
new file mode 100644
index 000000000..a3fab1175
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml
new file mode 100644
index 000000000..1e672600f
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 000000000..f94681eda
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.8
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 000000000..6c843dac5
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000..94a25f7f4
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file