diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 210367c..5ad0101 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
deleted file mode 100644
index d8e7c4e..0000000
Binary files a/.idea/caches/gradle_models.ser and /dev/null differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index c33b7e4..45b5654 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,8 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <AndroidXmlCodeStyleSettings>
+      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
@@ -14,6 +17,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -24,6 +28,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -35,6 +40,7 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -45,6 +51,7 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -55,6 +62,7 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -65,6 +73,7 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -75,6 +84,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -86,6 +96,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -97,6 +108,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>
diff --git a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
index c4582bc..0e73b8c 100644
--- a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: android.arch.core:runtime:1.1.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6ba4da1dc26f5cc392fafb612b33dde3/runtime-1.1.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6ba4da1dc26f5cc392fafb612b33dde3/runtime-1.1.1/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6ed36e64d19fbb140eab41e81e83fb81/runtime-1.1.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6ed36e64d19fbb140eab41e81e83fb81/runtime-1.1.1/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
index b5a8650..ad0a3f6 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/27b21e72c8fa18d59e59bc68ead1366d/livedata-1.1.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/27b21e72c8fa18d59e59bc68ead1366d/livedata-1.1.1/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/620dcdd05acbf60c6f21b269ddbcc44d/livedata-1.1.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/620dcdd05acbf60c6f21b269ddbcc44d/livedata-1.1.1/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
index 298f801..48b12ce 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/16b022f6222d778d50c20a4647255f26/livedata-core-1.1.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/16b022f6222d778d50c20a4647255f26/livedata-core-1.1.1/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d9480822a420f8b71d4809310057ac98/livedata-core-1.1.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d9480822a420f8b71d4809310057ac98/livedata-core-1.1.1/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
index b63e628..8d567ef 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5849346bd8986e1dc5af6b43fe6c118c/runtime-1.1.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5849346bd8986e1dc5af6b43fe6c118c/runtime-1.1.1/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f304d26e81c2ac674c8d718020f44ce2/runtime-1.1.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f304d26e81c2ac674c8d718020f44ce2/runtime-1.1.1/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
index d4c37bd..5736e02 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ad55dbb896c17fd0be3180be64e52c96/viewmodel-1.1.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ad55dbb896c17fd0be3180be64e52c96/viewmodel-1.1.1/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e8486cfa145a085ddb7749e90b86cd7a/viewmodel-1.1.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e8486cfa145a085ddb7749e90b86cd7a/viewmodel-1.1.1/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
index bb8c385..9113c99 100644
--- a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7bea7c66c85d11bb1e876f214716bcb3/animated-vector-drawable-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7bea7c66c85d11bb1e876f214716bcb3/animated-vector-drawable-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/02c7c6846dca5de6916e784b3b4c645f/animated-vector-drawable-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/02c7c6846dca5de6916e784b3b4c645f/animated-vector-drawable-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
index f5aca94..35b0c35 100644
--- a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:appcompat-v7:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/36f42ed6b2e1e9baf5d5081a60e361ec/appcompat-v7-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/40c172b322ab2cbaa5b264bd61fb1fe7/appcompat-v7-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/36f42ed6b2e1e9baf5d5081a60e361ec/appcompat-v7-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/36f42ed6b2e1e9baf5d5081a60e361ec/appcompat-v7-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/40c172b322ab2cbaa5b264bd61fb1fe7/appcompat-v7-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/40c172b322ab2cbaa5b264bd61fb1fe7/appcompat-v7-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
index 2e831f1..345c17f 100644
--- a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/acb1841bea1fd042aa955a5fc25120a5/asynclayoutinflater-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/acb1841bea1fd042aa955a5fc25120a5/asynclayoutinflater-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6bbb494af45561416a0fd17eba96f4cd/asynclayoutinflater-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6bbb494af45561416a0fd17eba96f4cd/asynclayoutinflater-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
index 469886b..ff5d667 100644
--- a/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:cardview-v7:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d206b313d7ad2a8565a2884e36e9fa1b/cardview-v7-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d206b313d7ad2a8565a2884e36e9fa1b/cardview-v7-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bbceac5ea10b377f4a1bfe0ef27e24c2/cardview-v7-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bbceac5ea10b377f4a1bfe0ef27e24c2/cardview-v7-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml
index 561823b..b4c5001 100644
--- a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/86474da3033ae8d95286820c9413c3bd/constraint-layout-1.1.3/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/86474da3033ae8d95286820c9413c3bd/constraint-layout-1.1.3/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/01a8c0061e5c8e400c59b1da7fe6af7f/constraint-layout-1.1.3/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/01a8c0061e5c8e400c59b1da7fe6af7f/constraint-layout-1.1.3/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
index 1c628f3..c874ff9 100644
--- a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4baa7647ca8676afe9c0c9ca4b03e48a/coordinatorlayout-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7b90df0ea12b43edfeb748d473f59b0/coordinatorlayout-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4baa7647ca8676afe9c0c9ca4b03e48a/coordinatorlayout-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4baa7647ca8676afe9c0c9ca4b03e48a/coordinatorlayout-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7b90df0ea12b43edfeb748d473f59b0/coordinatorlayout-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7b90df0ea12b43edfeb748d473f59b0/coordinatorlayout-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
index 8083603..c6482e4 100644
--- a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:cursoradapter:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/38434fc4a6619a73b2b72ee7482f02f6/cursoradapter-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/38434fc4a6619a73b2b72ee7482f02f6/cursoradapter-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fa3e9f44740e16b967ad338590f640f9/cursoradapter-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fa3e9f44740e16b967ad338590f640f9/cursoradapter-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
index d1a6955..b4e7f5c 100644
--- a/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:customview:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/17087f859076f08a18d04f01933b9ea0/customview-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/17087f859076f08a18d04f01933b9ea0/customview-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1e72ebf55c3ee4943e8d88d925c3a67c/customview-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1e72ebf55c3ee4943e8d88d925c3a67c/customview-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
index c13ea23..e060806 100644
--- a/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:design:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d3eacf13eb9f471b19f177f3fe238ee6/design-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2cceb2ce8c89f797eb3732ae151c5eed/design-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d3eacf13eb9f471b19f177f3fe238ee6/design-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d3eacf13eb9f471b19f177f3fe238ee6/design-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2cceb2ce8c89f797eb3732ae151c5eed/design-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2cceb2ce8c89f797eb3732ae151c5eed/design-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
index 329f5d2..b78a985 100644
--- a/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:documentfile:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a2ff984d9f86715cf00eeb8b6a228257/documentfile-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a2ff984d9f86715cf00eeb8b6a228257/documentfile-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b1f429bc867e6bef343718a928b27bcf/documentfile-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b1f429bc867e6bef343718a928b27bcf/documentfile-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
index a25f142..8939efc 100644
--- a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:drawerlayout:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/92527c141e9af6d5ba7111bf306bcd00/drawerlayout-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f64e093468ab77842c0a17619bdda714/drawerlayout-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/92527c141e9af6d5ba7111bf306bcd00/drawerlayout-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/92527c141e9af6d5ba7111bf306bcd00/drawerlayout-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f64e093468ab77842c0a17619bdda714/drawerlayout-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f64e093468ab77842c0a17619bdda714/drawerlayout-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml
index 99214c0..96990f1 100644
--- a/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:exifinterface:27.1.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fd65987a85161a396d1b1c7e572982fb/exifinterface-27.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fd65987a85161a396d1b1c7e572982fb/exifinterface-27.1.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/753644a8a421231bd03dae601286f889/exifinterface-27.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/753644a8a421231bd03dae601286f889/exifinterface-27.1.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
index 6cac6af..4abc4b3 100644
--- a/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:interpolator:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c621ce31a615c09ae2edbf0b62b5edf/interpolator-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c621ce31a615c09ae2edbf0b62b5edf/interpolator-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a7cc930c6c85553baec9442768e9910e/interpolator-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a7cc930c6c85553baec9442768e9910e/interpolator-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
index 7b4448d..35a4bc3 100644
--- a/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:loader:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0e9fbbedd762ebddfde7f27fd67d10ba/loader-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0e9fbbedd762ebddfde7f27fd67d10ba/loader-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/45258a756e6ebd4ac509787eddeba4a0/loader-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/45258a756e6ebd4ac509787eddeba4a0/loader-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
index da115cd..cb55f59 100644
--- a/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/11002e29f58c1a3e99a3dada9ac1e680/localbroadcastmanager-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/11002e29f58c1a3e99a3dada9ac1e680/localbroadcastmanager-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c9a4cff7d801afcde38a15c849aba7d3/localbroadcastmanager-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c9a4cff7d801afcde38a15c849aba7d3/localbroadcastmanager-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
index 06194b6..a2e0d61 100644
--- a/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:print:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/720e376f1d73e2e1ff5f94558f32db9d/print-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1d60f7a1f34b86e30b27d981246805b0/print-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/720e376f1d73e2e1ff5f94558f32db9d/print-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/720e376f1d73e2e1ff5f94558f32db9d/print-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1d60f7a1f34b86e30b27d981246805b0/print-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1d60f7a1f34b86e30b27d981246805b0/print-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
index d5e014c..e72178e 100644
--- a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ed7cc05110f8f01c772bb232f71c52b9/recyclerview-v7-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/420bf1ba9060f87a0d755513f44eccff/recyclerview-v7-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ed7cc05110f8f01c772bb232f71c52b9/recyclerview-v7-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ed7cc05110f8f01c772bb232f71c52b9/recyclerview-v7-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/420bf1ba9060f87a0d755513f44eccff/recyclerview-v7-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/420bf1ba9060f87a0d755513f44eccff/recyclerview-v7-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
index 71268a9..7816982 100644
--- a/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8c998c48ae565bd10f30411f176badff/slidingpanelayout-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8c998c48ae565bd10f30411f176badff/slidingpanelayout-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f6bf15b8ac7305beb683644a8b84171b/slidingpanelayout-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f6bf15b8ac7305beb683644a8b84171b/slidingpanelayout-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
index 34815e7..3aff30b 100644
--- a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-compat:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/571d2d2f77a68cdc1b3d0f57095cead2/support-compat-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/55bb126aa8799a19185c1769b3802de6/support-compat-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/571d2d2f77a68cdc1b3d0f57095cead2/support-compat-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/571d2d2f77a68cdc1b3d0f57095cead2/support-compat-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/55bb126aa8799a19185c1769b3802de6/support-compat-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/55bb126aa8799a19185c1769b3802de6/support-compat-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
index 20f6f26..e770e4b 100644
--- a/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-core-ui:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f2e44d2a80d9144068b064224835bedc/support-core-ui-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f2e44d2a80d9144068b064224835bedc/support-core-ui-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/95e05009c6f4970c7674399faa6801cb/support-core-ui-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/95e05009c6f4970c7674399faa6801cb/support-core-ui-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
index 797a792..e58b2b7 100644
--- a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-core-utils:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/18c38e22766c3b04fc331ed6c0901ff7/support-core-utils-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/18c38e22766c3b04fc331ed6c0901ff7/support-core-utils-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/21da103b05e0da3ef0c3912db0f543eb/support-core-utils-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/21da103b05e0da3ef0c3912db0f543eb/support-core-utils-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
index b7db675..a6ce645 100644
--- a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-fragment:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4cba3cae8ce3dd3f8ed6cfc82d5b6643/support-fragment-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1b2cfac5df8473d8ba6bf25b647ece81/support-fragment-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4cba3cae8ce3dd3f8ed6cfc82d5b6643/support-fragment-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4cba3cae8ce3dd3f8ed6cfc82d5b6643/support-fragment-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1b2cfac5df8473d8ba6bf25b647ece81/support-fragment-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1b2cfac5df8473d8ba6bf25b647ece81/support-fragment-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml
index 919f5de..cd58189 100644
--- a/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-media-compat:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/87c82a0ed27521c02ae02bf2f69c5c9c/support-media-compat-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/85bd6d9bdc03a21f96f63442247904c6/support-media-compat-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/87c82a0ed27521c02ae02bf2f69c5c9c/support-media-compat-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/87c82a0ed27521c02ae02bf2f69c5c9c/support-media-compat-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/85bd6d9bdc03a21f96f63442247904c6/support-media-compat-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/85bd6d9bdc03a21f96f63442247904c6/support-media-compat-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml
index 6276e00..904aa00 100644
--- a/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-v4:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/50b2f250a1a1f44ae2c7bb8075c089cb/support-v4-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/50b2f250a1a1f44ae2c7bb8075c089cb/support-v4-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8cb7bcedb8e3dca36a0b3cbbb9ea9648/support-v4-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8cb7bcedb8e3dca36a0b3cbbb9ea9648/support-v4-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
index 1ffccdc..5e6278a 100644
--- a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52476dbc836d27a893defb88a4584369/support-vector-drawable-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52476dbc836d27a893defb88a4584369/support-vector-drawable-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9ef90871aedc840ef5b19c648c5ae85/support-vector-drawable-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9ef90871aedc840ef5b19c648c5ae85/support-vector-drawable-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
index 4acfb13..b3524b1 100644
--- a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1460f7492d690193072cdc1e4d5f493d/swiperefreshlayout-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bb36339521ed6409a2d50bed502cff2a/swiperefreshlayout-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1460f7492d690193072cdc1e4d5f493d/swiperefreshlayout-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1460f7492d690193072cdc1e4d5f493d/swiperefreshlayout-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bb36339521ed6409a2d50bed502cff2a/swiperefreshlayout-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bb36339521ed6409a2d50bed502cff2a/swiperefreshlayout-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
index 2e21d09..5c70e80 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/863322fc611a5e60f0c0462e4ffe10db/espresso-core-3.0.2/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/863322fc611a5e60f0c0462e4ffe10db/espresso-core-3.0.2/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/aa01cda537b4992d9446972ac4b7f5e2/espresso-core-3.0.2/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/aa01cda537b4992d9446972ac4b7f5e2/espresso-core-3.0.2/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-core/3.0.2/137b6340c2f4bdfede28825af5ac3221f1ed9653/espresso-core-3.0.2-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
index a752391..7ce5213 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5460e38a6c8fa01b873674db19c89b52/espresso-idling-resource-3.0.2/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5460e38a6c8fa01b873674db19c89b52/espresso-idling-resource-3.0.2/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e4a40042c223c087500fe5b8c430fbe/espresso-idling-resource-3.0.2/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e4a40042c223c087500fe5b8c430fbe/espresso-idling-resource-3.0.2/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-idling-resource/3.0.2/d4b16112a486446a92fc3dedce6b0d78ec57b09a/espresso-idling-resource-3.0.2-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
index 10d9638..a791ef6 100644
--- a/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test:monitor:1.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/58d15b6791228039861cf501352471ed/monitor-1.0.2/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/58d15b6791228039861cf501352471ed/monitor-1.0.2/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f453af2f7f5bd17630fb3a6d058a6817/monitor-1.0.2/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f453af2f7f5bd17630fb3a6d058a6817/monitor-1.0.2/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/monitor/1.0.2/6cc016eaa2b8a238607fe5fc20f27135bf8d7fd/monitor-1.0.2-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
index 09e8ac1..b32d04a 100644
--- a/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test:runner:1.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/77570b68c2ed2985ebd0e8daaa41c74e/runner-1.0.2/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/77570b68c2ed2985ebd0e8daaa41c74e/runner-1.0.2/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3ec3544810c7deaa24e1033e0f0734e1/runner-1.0.2/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3ec3544810c7deaa24e1033e0f0734e1/runner-1.0.2/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/runner/1.0.2/493b6daca0eaa2f479bd6028d1754b6b7eecbd5a/runner-1.0.2-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
index 1c70f79..bef5094 100644
--- a/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:transition:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/88cdd461ca792f240fbf471df90be579/transition-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cba45a7aa40d0da266b0bba795099f0/transition-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/88cdd461ca792f240fbf471df90be579/transition-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/88cdd461ca792f240fbf471df90be579/transition-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cba45a7aa40d0da266b0bba795099f0/transition-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cba45a7aa40d0da266b0bba795099f0/transition-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
index 90a85a6..01d27ea 100644
--- a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:versionedparcelable:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/66e058fb916db2946b1b0926fe9b4755/versionedparcelable-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/66e058fb916db2946b1b0926fe9b4755/versionedparcelable-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9b9c4c649b4547a1a2a29a66e60463ed/versionedparcelable-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9b9c4c649b4547a1a2a29a66e60463ed/versionedparcelable-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
index 514f8cb..42a9b45 100644
--- a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:viewpager:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1b9e12c96861d7bb9289410423d91fc8/viewpager-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1b9e12c96861d7bb9289410423d91fc8/viewpager-28.0.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4058136cb75c11e77fd3f407a6252dc5/viewpager-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4058136cb75c11e77fd3f407a6252dc5/viewpager-28.0.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_ealva_ealvalog_android_0_5_0_aar.xml b/.idea/libraries/Gradle__com_ealva_ealvalog_android_0_5_0_aar.xml
index 88f14d2..3d73041 100644
--- a/.idea/libraries/Gradle__com_ealva_ealvalog_android_0_5_0_aar.xml
+++ b/.idea/libraries/Gradle__com_ealva_ealvalog_android_0_5_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.ealva:ealvalog-android:0.5.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/14f7b363c26cd4b5daeafb392a51f3c3/ealvalog-android-0.5.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/14f7b363c26cd4b5daeafb392a51f3c3/ealvalog-android-0.5.0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bb8488788503b8cd5695ca9b42c24cb4/ealvalog-android-0.5.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bb8488788503b8cd5695ca9b42c24cb4/ealvalog-android-0.5.0/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog-android/0.5.0/5e587d4a961a30028dcd4a88b5dea1f317208160/ealvalog-android-0.5.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_XuDeveloper_XPopupWindow_1_0_1_aar.xml b/.idea/libraries/Gradle__com_github_XuDeveloper_XPopupWindow_1_0_1_aar.xml
index 5841883..a8e2c6d 100644
--- a/.idea/libraries/Gradle__com_github_XuDeveloper_XPopupWindow_1_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_github_XuDeveloper_XPopupWindow_1_0_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.github.XuDeveloper:XPopupWindow:1.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/32a6f2fd82177fa050013d2399348c09/XPopupWindow-1.0.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/32a6f2fd82177fa050013d2399348c09/XPopupWindow-1.0.1/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e18d3506cbad107043af39fb3ff623f0/XPopupWindow-1.0.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e18d3506cbad107043af39fb3ff623f0/XPopupWindow-1.0.1/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
index 5c4dd4e..f97c138 100644
--- a/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
+++ b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
@@ -3,7 +3,9 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/67ff45d9ae02e583d0f9b3432a5ebbe05c30c966/javawriter-2.1.1.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/f591a105db78771d0a1e7a277b3747556c528c22/javawriter-2.1.1-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/5b31387d839a5cdaf5b6de3990da01f7f2b963c5/javawriter-2.1.1-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml
index 3bb1ed9..ffed7c4 100644
--- a/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml
+++ b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml
@@ -3,7 +3,9 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/7ef0f1d95bf4c0b3ba30bbae25e0e562b05cf75e/okhttp-3.10.0.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/340395260efeade793140f10c82fb1ecc6ce160c/okhttp-3.10.0-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/e99b7b608968f16b07104b93e62cb90701174d0/okhttp-3.10.0-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml b/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml
index bbfeb24..0b6eeb4 100644
--- a/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml
+++ b/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.squareup.picasso:picasso:2.71828@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9157c3a7f913879cff6125b7ba7e83e0/picasso-2.71828/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9157c3a7f913879cff6125b7ba7e83e0/picasso-2.71828/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/801d86a3f9a129323d8c786c4d6ba346/picasso-2.71828/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/801d86a3f9a129323d8c786c4d6ba346/picasso-2.71828/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.picasso/picasso/2.71828/2843564e6bac90b1e125104d7c842c87a96a8ee9/picasso-2.71828-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml b/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
index f9c9a30..5ac7d7b 100644
--- a/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
+++ b/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
@@ -3,7 +3,9 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/70ec961c25111ed9015d1af77772d96383c2d238/javax.inject-1-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/a00123f261762a7c5e0ec916a2c7c8298d29c400/javax.inject-1-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
index f4f25a8..24e5b72 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
@@ -3,7 +3,9 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/941a8be4506c65f0a9001c08812fb7da1e505e21/junit-4.12-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
index 5855a29..ddd2635 100644
--- a/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
+++ b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
@@ -3,7 +3,9 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.kxml/kxml2/2.3.0/ccbc77a5fd907ef863c29f3596c6f54ffa4e9442/kxml2-2.3.0.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.kxml/kxml2/2.3.0/dcb10030b92be67fd9dd224ade52310e40bbaf33/kxml2-2.3.0-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.kxml/kxml2/2.3.0/309cd2cff7260e465792fda3dcbb063b730d8050/kxml2-2.3.0-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
index 50cf2b9..6b1e2e7 100644
--- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
@@ -3,7 +3,9 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/ad09811315f1d4f5756986575b0ea16b99cd686f/hamcrest-core-1.3-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
index a5eaca5..a8015c9 100644
--- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
@@ -3,7 +3,9 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/5de0c73fef18917cd85d0ab70bb23818685e4dfd/hamcrest-integration-1.3.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/cc5884d4138d3376f574f6a3992acceedfc37bea/hamcrest-integration-1.3-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/ae7787a563e6a1b1f17fd4ac43be3a3c8830cfda/hamcrest-integration-1.3-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
index b4dabdc..00bb125 100644
--- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
@@ -3,7 +3,9 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/4785a3c21320980282f9f33d0d1264a69040538f/hamcrest-library-1.3.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/4324046c5f99f3dc91b5370899fa3ae65fd137d2/hamcrest-library-1.3-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/47a7ee46628ab7133129cd7cef1e92657bc275e/hamcrest-library-1.3-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml
index 25ba040..4984359 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:anko:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2208888bc8bf2426d968e12b1a98e1c1/anko-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2208888bc8bf2426d968e12b1a98e1c1/anko-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/746373d9bb5d2847c635f69f30e8e6c8/anko-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/746373d9bb5d2847c635f69f30e8e6c8/anko-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml
index a25cb60..25535c1 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:anko-appcompat-v7:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9927abc145e23db92fdb3f5563e5b377/anko-appcompat-v7-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9927abc145e23db92fdb3f5563e5b377/anko-appcompat-v7-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ef280b3f04d336c753ffb84d9680e18c/anko-appcompat-v7-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ef280b3f04d336c753ffb84d9680e18c/anko-appcompat-v7-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml
index 5e60da0..3ca4069 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:anko-appcompat-v7-commons:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6f9159edf5cab475330b0b081fd0619c/anko-appcompat-v7-commons-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6f9159edf5cab475330b0b081fd0619c/anko-appcompat-v7-commons-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/377850cc684b95d7d96577c55078b42a/anko-appcompat-v7-commons-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/377850cc684b95d7d96577c55078b42a/anko-appcompat-v7-commons-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml
index a0dd572..8aa417a 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:anko-appcompat-v7-coroutines:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9453a19abc27485ff9d4d9c71b25740c/anko-appcompat-v7-coroutines-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9453a19abc27485ff9d4d9c71b25740c/anko-appcompat-v7-coroutines-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7855097bc6583aaed9a1ab6b197b79d1/anko-appcompat-v7-coroutines-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7855097bc6583aaed9a1ab6b197b79d1/anko-appcompat-v7-coroutines-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml
index dfef706..0a03998 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:anko-commons:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d5aedd9f28726c28a8b338c9b4121c8/anko-commons-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d5aedd9f28726c28a8b338c9b4121c8/anko-commons-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e8dfe65d4d95a32181950bb16eba586d/anko-commons-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e8dfe65d4d95a32181950bb16eba586d/anko-commons-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml
index 3768dd6..2e57db6 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:anko-coroutines:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8e39823602fb248a6be7de061b91a284/anko-coroutines-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8e39823602fb248a6be7de061b91a284/anko-coroutines-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/87f134ca51f8986f93e20480c978a028/anko-coroutines-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/87f134ca51f8986f93e20480c978a028/anko-coroutines-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml
index 001703c..5b2d904 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:anko-sdk27:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d1c7400130be29ee0297d39e08cdee69/anko-sdk27-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d1c7400130be29ee0297d39e08cdee69/anko-sdk27-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5a6fb5ec6de7ecb19f5d15c8e34e0ff1/anko-sdk27-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5a6fb5ec6de7ecb19f5d15c8e34e0ff1/anko-sdk27-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml
index 6b4a059..8583703 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:anko-sdk27-coroutines:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/30464863fc947263fbd8513e10e4ebd5/anko-sdk27-coroutines-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/30464863fc947263fbd8513e10e4ebd5/anko-sdk27-coroutines-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/383973069d3f0771c8544b869eb46e65/anko-sdk27-coroutines-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/383973069d3f0771c8544b869eb46e65/anko-sdk27-coroutines-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml
index 37f5058..c18178a 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:anko-sqlite:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/887729144612f4c9223d7d6d36d74bd4/anko-sqlite-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/887729144612f4c9223d7d6d36d74bd4/anko-sqlite-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f3526847558421d7be29069614a95f06/anko-sqlite-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f3526847558421d7be29069614a95f06/anko-sqlite-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml
index f820091..ca50bed 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:anko-support-v4:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/58750f1ab949c4660bfa6a7dc1cad864/anko-support-v4-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/58750f1ab949c4660bfa6a7dc1cad864/anko-support-v4-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9d333341a07697ba76dce31b50371a33/anko-support-v4-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9d333341a07697ba76dce31b50371a33/anko-support-v4-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml
index ece08ac..18b5371 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:anko-support-v4-commons:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7cb8028946c15b919239bf8e8a729b8/anko-support-v4-commons-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7cb8028946c15b919239bf8e8a729b8/anko-support-v4-commons-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bb6c0c160da72f3f25e56facfec807f2/anko-support-v4-commons-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bb6c0c160da72f3f25e56facfec807f2/anko-support-v4-commons-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml
index 7f71279..8554b6c 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:appcompatV7-base:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/55250258869da82e2104f6ff7e8e6940/appcompatV7-base-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/55250258869da82e2104f6ff7e8e6940/appcompatV7-base-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/39ac3dfb7e32b3fe44c157c742509500/appcompatV7-base-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/39ac3dfb7e32b3fe44c157c742509500/appcompatV7-base-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml
index 071ec92..56ad79c 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:commons-base:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cfc1de7182c0b1e5a12e46d2d9b5d0b9/commons-base-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cfc1de7182c0b1e5a12e46d2d9b5d0b9/commons-base-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/66ebfec852bd365d06cf30471d7c6895/commons-base-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/66ebfec852bd365d06cf30471d7c6895/commons-base-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml
index cad494a..9e5c208 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:platform-base:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/12d3d61991d7823ec32e269ea5cf3809/platform-base-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/12d3d61991d7823ec32e269ea5cf3809/platform-base-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6a0be88e1b0bfbd66f2cb1bc87c2d867/platform-base-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6a0be88e1b0bfbd66f2cb1bc87c2d867/platform-base-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml
index 2de8bf6..0968c6d 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:sqlite-base:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c19b8d86b5720d6e9dad5fb5abb1057d/sqlite-base-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c19b8d86b5720d6e9dad5fb5abb1057d/sqlite-base-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e0df6c358bae9e624b349ff485418f9/sqlite-base-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e0df6c358bae9e624b349ff485418f9/sqlite-base-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml
index b79da0c..54e97c1 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.jetbrains.anko:supportV4-base:0.10.8@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/268fd08bb3643ba8d94d891eb6b30b07/supportV4-base-0.10.8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/268fd08bb3643ba8d94d891eb6b30b07/supportV4-base-0.10.8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4053d6dbc908f798d8e2441414147a36/supportV4-base-0.10.8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4053d6dbc908f798d8e2441414147a36/supportV4-base-0.10.8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_annotations_16_0_2_jar.xml b/.idea/libraries/Gradle__org_jetbrains_annotations_16_0_2_jar.xml
index 39c2558..ffca577 100644
--- a/.idea/libraries/Gradle__org_jetbrains_annotations_16_0_2_jar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_annotations_16_0_2_jar.xml
@@ -3,7 +3,9 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/16.0.2/dab5655eb9abe23f2245c34e66c9813c7daf4563/annotations-16.0.2.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/16.0.2/389de2aaeb8ddbab587e36183cd6a4ae585ecab2/annotations-16.0.2-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/16.0.2/11ef7b63fea95edbd3ea28f564d8bec5d86b5d0e/annotations-16.0.2-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_0_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_0_jar.xml
index 66dccaf..0ea3e78 100644
--- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_0_jar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_0_jar.xml
@@ -3,7 +3,9 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/2102040565a29061ab7aaea6ea548ad51eafb11d/kotlinx-coroutines-android-1.0.0.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/1381306d9f78d32683c0c9dbf28319a13d95b1df/kotlinx-coroutines-android-1.0.0-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/b11571ee5deb9c8b47887a79070d0c6c0940a8f6/kotlinx-coroutines-android-1.0.0-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_0_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_0_jar.xml
index 4200a1b..b0ba499 100644
--- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_0_jar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_0_jar.xml
@@ -3,7 +3,9 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/a33c4bf7581f71f01d4ed660b09ca199abbb44da/kotlinx-coroutines-core-1.0.0.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/ba1a536f0ce46feb08939c83bc9851945bcde648/kotlinx-coroutines-core-1.0.0-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/25f38c379fd216bf66c638fc5f5b595650c1bd64/kotlinx-coroutines-core-1.0.0-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_1_0_0_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_1_0_0_jar.xml
index 4d48228..549386a 100644
--- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_1_0_0_jar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_1_0_0_jar.xml
@@ -3,7 +3,9 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/5f7551ec1edc068deaa0397100a1f14f32270274/kotlinx-coroutines-core-common-1.0.0.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/2de0788cf8e15f171aeff8c2ffcb1bf8240bbcd5/kotlinx-coroutines-core-common-1.0.0-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/fbe00e9f1a3138c7d138fe4e02724366e9e42f24/kotlinx-coroutines-core-common-1.0.0-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 32eb68d..a364d89 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/app/src/main/cpp/3rdparty/json" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3ca1fd7..7639c24 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -108,12 +108,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="a8334612-2e51-4ba4-b605-06a26be592d3" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okio_okio_1_14_0_jar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Mear.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml" afterDir="false" />
@@ -131,6 +127,7 @@
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml" afterDir="false" />
@@ -152,8 +149,17 @@
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_ealva_ealvalog_android_0_3_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_ealva_ealvalog_android_0_3_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okio_okio_1_11_0_jar.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_ealva_ealvalog_android_0_5_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_ealva_ealvalog_android_0_5_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_github_XuDeveloper_XPopupWindow_1_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_github_XuDeveloper_XPopupWindow_1_0_1_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__junit_junit_4_12_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__junit_junit_4_12_jar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml" afterDir="false" />
@@ -170,12 +176,27 @@
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_annotations_16_0_2_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_annotations_16_0_2_jar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_0_jar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_0_jar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_1_0_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_1_0_0_jar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Mear.iml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/popup_layout.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/popup_layout.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mear.iml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/3rdparty/json" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/3rdparty/json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/3rdparty/json/ChangeLog.md" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/3rdparty/json/ChangeLog.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/3rdparty/json/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/3rdparty/json/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/Demo.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/Demo.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/SongRepository.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/SongRepository.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/SongRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/SongRepository.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/Tok.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/Tok.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/Tok.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/Tok.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/DemoStreamActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/DemoStreamActivity.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/content_demo_stream.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/content_demo_stream.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.gradle/" />
     <ignored path="$PROJECT_DIR$/build/classes/" />
@@ -227,6 +248,10 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="DefaultGradleProjectSettings">
+    <option name="isMigrated" value="true" />
+  </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="ZY2248HP8X" />
   <component name="ExternalProjectsData">
     <projectState path="$PROJECT_DIR$">
       <ProjectState />
@@ -240,28 +265,106 @@
     </system>
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/build.gradle">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app/src/main/cpp/Demo.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="207">
-              <caret line="33" column="51" selection-start-line="33" selection-start-column="51" selection-end-line="33" selection-end-column="51" />
+            <state relative-caret-position="1408">
+              <caret line="110" column="21" selection-start-line="110" selection-start-column="21" selection-end-line="110" selection-end-column="21" />
+              <folding>
+                <element signature="e#41#60#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/popup_layout.xml">
-          <provider editor-type-id="android-designer2" />
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Song.kt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="416">
-              <caret line="26" column="41" selection-start-line="26" selection-start-column="41" selection-end-line="26" selection-end-column="41" />
+            <state relative-caret-position="48">
+              <caret line="3" column="61" selection-start-line="3" selection-start-column="61" selection-end-line="3" selection-end-column="61" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/build.gradle">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="368">
+              <caret line="23" column="26" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/src/main/cpp/Tok.cpp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="509">
+              <caret line="64" column="28" selection-start-line="64" selection-start-column="28" selection-end-line="64" selection-end-column="28" />
+              <folding>
+                <element signature="e#41#57#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="240">
+              <caret line="15" column="53" selection-start-line="15" selection-start-column="53" selection-end-line="15" selection-end-column="53" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/src/main/cpp/SongRepository.cpp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="240">
+              <caret line="47" selection-start-line="47" selection-end-line="47" />
+              <folding>
+                <element signature="e#41#68#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/DemoStreamActivity.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="224">
+              <caret line="62" selection-start-line="62" selection-end-line="62" />
+              <folding>
+                <element signature="e#37#372#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_demo_stream.xml">
+          <provider editor-type-id="text-editor" />
+          <provider selected="true" editor-type-id="android-designer2" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/src/main/cpp/SongRepository.h">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="272">
+              <caret line="20" column="14" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Kotlin Class" />
+      </list>
+    </option>
+  </component>
   <component name="GenerateSignedApkSettings">
     <option name="EXPORT_PRIVATE_KEY" value="false" />
     <option name="KEY_STORE_PATH" value="$USER_HOME$/other/keys/android/keystore/mear_kotlin_debug.jks" />
@@ -273,8 +376,19 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/app/build.gradle" />
         <option value="$PROJECT_DIR$/app/src/main/res/layout/popup_layout.xml" />
+        <option value="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" />
+        <option value="$PROJECT_DIR$/app/src/main/res/layout/content_demo_stream.xml" />
+        <option value="$PROJECT_DIR$/app/build.gradle" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/Tok.h" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/Song.kt" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Song.kt" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/Tok.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/SongRepository.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/SongRepository.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/DemoStreamActivity.kt" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/Demo.cpp" />
       </list>
     </option>
   </component>
@@ -283,29 +397,106 @@
     <option name="width" value="1920" />
     <option name="height" value="1079" />
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
-    <navigator proportions="" version="1">
+    <navigator currentView="ProjectPane" proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane" />
-      <pane id="AndroidView">
+      <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
-              <item name="Mear" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
             </path>
             <path>
-              <item name="Mear" type="1abcf292:AndroidViewProjectNode" />
-              <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="cpp" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="mear" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="mear" type="462c0819:PsiDirectoryNode" />
+              <item name="activities" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="mear" type="462c0819:PsiDirectoryNode" />
+              <item name="models" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="res" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="res" type="462c0819:PsiDirectoryNode" />
+              <item name="layout" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="AndroidView" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -319,6 +510,11 @@
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="sync.plugin.last.upgrade.timestamp" value="1564018266204" />
   </component>
+  <component name="RecentsManager">
+    <key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
+      <recent name="com.example.mear.models" />
+    </key>
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -407,46 +603,223 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="-16" width="1920" height="1078" extended-state="0" />
+    <frame x="0" y="-16" width="1920" height="1079" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Capture Tool" />
-      <window_info content_ui="combo" id="Project" visible="true" weight="0.32977587" />
-      <window_info id="Structure" side_tool="true" />
-      <window_info id="Favorites" side_tool="true" />
-      <window_info id="Build Variants" side_tool="true" />
-      <window_info id="Image Layers" />
-      <window_info id="Designer" />
-      <window_info id="Resources Explorer" />
       <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Logcat" />
-      <window_info anchor="bottom" id="TODO" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info anchor="bottom" id="Event Log" sideWeight="0.50053364" side_tool="true" visible="true" weight="0.32952183" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="Build" sideWeight="0.4994664" visible="true" weight="0.32952183" />
-      <window_info anchor="bottom" id="Android Profiler" show_stripe_button="false" />
-      <window_info anchor="right" id="Device File Explorer" side_tool="true" />
-      <window_info anchor="right" id="Capture Analysis" />
-      <window_info anchor="right" id="Gradle" />
-      <window_info anchor="right" id="Theme Preview" />
-      <window_info active="true" anchor="right" id="Preview" visible="true" weight="0.32977587" />
-      <window_info anchor="right" id="Palette&#9;" />
+      <window_info content_ui="combo" id="Project" order="1" weight="0.22198506" />
+      <window_info id="Structure" order="2" side_tool="true" />
+      <window_info id="Build Variants" order="3" side_tool="true" />
+      <window_info id="Image Layers" order="4" />
+      <window_info id="Designer" order="5" />
+      <window_info id="Resources Explorer" order="6" />
+      <window_info id="Capture Tool" order="7" />
+      <window_info id="Favorites" order="8" side_tool="true" />
+      <window_info anchor="bottom" id="Version Control" order="0" />
+      <window_info anchor="bottom" id="Logcat" order="1" />
+      <window_info anchor="bottom" id="TODO" order="2" />
+      <window_info anchor="bottom" id="Android Profiler" order="3" />
+      <window_info anchor="bottom" id="Terminal" order="4" weight="0.32917964" />
+      <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.5010672" side_tool="true" weight="0.32917964" />
+      <window_info anchor="bottom" id="Build" order="6" sideWeight="0.49893278" weight="0.3281412" />
+      <window_info anchor="bottom" id="Run" order="7" />
+      <window_info active="true" anchor="bottom" id="Debug" order="8" sideWeight="0.49893278" visible="true" weight="0.32917964" />
+      <window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
+      <window_info anchor="right" id="Capture Analysis" order="1" />
+      <window_info anchor="right" id="Gradle" order="2" />
+      <window_info anchor="right" id="Theme Preview" order="3" />
+      <window_info anchor="right" id="Palette&#9;" order="4" />
+      <window_info active="true" anchor="right" id="Preview" order="5" visible="true" weight="0.32977587" />
     </layout>
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/DemoStreamActivity.kt</url>
+          <line>62</line>
+          <properties />
+          <option name="timeStamp" value="13" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/DemoStreamActivity.kt</url>
+          <line>60</line>
+          <properties />
+          <option name="timeStamp" value="15" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/Demo.cpp</url>
+          <line>139</line>
+          <option name="timeStamp" value="14" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/Demo.cpp</url>
+          <line>98</line>
+          <option name="timeStamp" value="17" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/Demo.cpp</url>
+          <line>126</line>
+          <option name="timeStamp" value="22" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/SongRepository.cpp</url>
+          <line>47</line>
+          <option name="timeStamp" value="32" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/Demo.cpp</url>
+          <line>33</line>
+          <option name="timeStamp" value="33" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/app/build.gradle">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/popup_layout.xml" />
+    <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="33" column="51" selection-start-line="33" selection-start-column="51" selection-end-line="33" selection-end-column="51" />
+        <state relative-caret-position="80">
+          <caret line="5" column="69" selection-start-line="5" selection-start-column="69" selection-end-line="5" selection-end-column="69" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/popup_layout.xml">
-      <provider editor-type-id="android-designer2" />
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/3rdparty/json/single_include/nlohmann/json.hpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="416">
-          <caret line="26" column="41" selection-start-line="26" selection-start-column="41" selection-end-line="26" selection-end-column="41" />
+        <state relative-caret-position="160">
+          <caret line="4132" selection-start-line="4132" selection-end-line="4132" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build.gradle">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_demo_stream.xml">
+      <provider editor-type-id="text-editor" />
+      <provider selected="true" editor-type-id="android-designer2" />
+    </entry>
+    <entry file="file://$USER_HOME$/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/memory">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="206">
+          <caret line="2931" selection-start-line="2931" selection-end-line="2931" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Track.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="2" column="11" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/models/PlayCount.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="2" column="11" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/Tok.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="21" selection-start-line="21" selection-end-line="21" />
+          <folding>
+            <element signature="e#80#97#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/AppCompatPreferenceActivity.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-672">
+          <caret line="17" column="15" selection-start-line="17" selection-start-column="15" selection-end-line="17" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Song.kt" />
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_demo_stream.xml">
+      <provider editor-type-id="text-editor" />
+      <provider selected="true" editor-type-id="android-designer2" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="15" column="53" selection-start-line="15" selection-start-column="53" selection-end-line="15" selection-end-column="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/commons-base/0.10.8/a7b9886dd34c114aebcbcd7c492855425b2300e1/commons-base-0.10.8-sources.jar!/dialogs/Toasts.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="561">
+          <caret line="73" selection-start-line="73" selection-end-line="73" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/build.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="368">
+          <caret line="23" column="26" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/jni.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="206">
+          <caret line="840" selection-start-line="840" selection-end-line="840" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Song.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="3" column="61" selection-start-line="3" selection-start-column="61" selection-end-line="3" selection-end-column="61" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/Tok.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="509">
+          <caret line="64" column="28" selection-start-line="64" selection-start-column="28" selection-end-line="64" selection-end-column="28" />
+          <folding>
+            <element signature="e#41#57#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/SongRepository.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="20" column="14" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/SongRepository.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="47" selection-start-line="47" selection-end-line="47" />
+          <folding>
+            <element signature="e#41#68#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/DemoStreamActivity.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="224">
+          <caret line="62" selection-start-line="62" selection-end-line="62" />
+          <folding>
+            <element signature="e#37#372#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/Demo.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1408">
+          <caret line="110" column="21" selection-start-line="110" selection-start-column="21" selection-end-line="110" selection-end-column="21" />
+          <folding>
+            <element signature="e#41#60#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/Mear.iml b/Mear.iml
deleted file mode 100644
index 0fbbc63..0000000
--- a/Mear.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="Mear" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <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" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 42fa1fa..934907e 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -4,8 +4,8 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":app" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.0" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.0" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.1" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.1" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
@@ -25,11 +25,11 @@
       </configuration>
     </facet>
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
+      <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false" pureKotlinSourceFolders="$MODULE_DIR$/src/debug/kotlin;/home/brahmix/programming/kotlin/mear/app/src/debug/java;/home/brahmix/programming/kotlin/mear/app/src/release/kotlin;/home/brahmix/programming/kotlin/mear/app/src/release/java;/home/brahmix/programming/kotlin/mear/app/src/debugAndroidTest/kotlin;/home/brahmix/programming/kotlin/mear/app/src/debugUnitTest/kotlin;/home/brahmix/programming/kotlin/mear/app/src/releaseUnitTest/kotlin">
         <compilerSettings />
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/transforms-2/files-2.1/14f7b363c26cd4b5daeafb392a51f3c3/ealvalog-android-0.5.0/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.50/50ad05ea1c2595fb31b800e76db464d08d599af3/kotlin-stdlib-jdk7-1.3.50.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/2208888bc8bf2426d968e12b1a98e1c1/anko-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvatag/0.4.3/3c93057202a128c3dfde894b9050d043eb49d908/ealvatag-0.4.3.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9157c3a7f913879cff6125b7ba7e83e0/picasso-2.71828/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/7ef0f1d95bf4c0b3ba30bbae25e0e562b05cf75e/okhttp-3.10.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.0/7e006aaf475d67f9521f04dcbe8865361300f4f1/okio-jvm-2.4.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/887729144612f4c9223d7d6d36d74bd4/anko-sqlite-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/d1c7400130be29ee0297d39e08cdee69/anko-sdk27-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/30464863fc947263fbd8513e10e4ebd5/anko-sdk27-coroutines-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9927abc145e23db92fdb3f5563e5b377/anko-appcompat-v7-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/58750f1ab949c4660bfa6a7dc1cad864/anko-support-v4-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9453a19abc27485ff9d4d9c71b25740c/anko-appcompat-v7-coroutines-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/6f9159edf5cab475330b0b081fd0619c/anko-appcompat-v7-commons-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f7cb8028946c15b919239bf8e8a729b8/anko-support-v4-commons-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/5d5aedd9f28726c28a8b338c9b4121c8/anko-commons-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8e39823602fb248a6be7de061b91a284/anko-coroutines-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/c19b8d86b5720d6e9dad5fb5abb1057d/sqlite-base-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/12d3d61991d7823ec32e269ea5cf3809/platform-base-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/55250258869da82e2104f6ff7e8e6940/appcompatV7-base-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/268fd08bb3643ba8d94d891eb6b30b07/supportV4-base-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/cfc1de7182c0b1e5a12e46d2d9b5d0b9/commons-base-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/2102040565a29061ab7aaea6ea548ad51eafb11d/kotlinx-coroutines-android-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/a33c4bf7581f71f01d4ed660b09ca199abbb44da/kotlinx-coroutines-core-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.50/b529d1738c7e98bbfa36a4134039528f2ce78ebf/kotlin-stdlib-1.3.50.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/5f7551ec1edc068deaa0397100a1f14f32270274/kotlinx-coroutines-core-common-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.50/3d9cd3e1bc7b92e95f43d45be3bfbcf38e36ab87/kotlin-stdlib-common-1.3.50.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/16.0.2/dab5655eb9abe23f2245c34e66c9813c7daf4563/annotations-16.0.2.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/d3eacf13eb9f471b19f177f3fe238ee6/design-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/36f42ed6b2e1e9baf5d5081a60e361ec/appcompat-v7-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/d206b313d7ad2a8565a2884e36e9fa1b/cardview-v7-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/50b2f250a1a1f44ae2c7bb8075c089cb/support-v4-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4cba3cae8ce3dd3f8ed6cfc82d5b6643/support-fragment-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/7bea7c66c85d11bb1e876f214716bcb3/animated-vector-drawable-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/ed7cc05110f8f01c772bb232f71c52b9/recyclerview-v7-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f2e44d2a80d9144068b064224835bedc/support-core-ui-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/18c38e22766c3b04fc331ed6c0901ff7/support-core-utils-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/52476dbc836d27a893defb88a4584369/support-vector-drawable-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/87c82a0ed27521c02ae02bf2f69c5c9c/support-media-compat-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/88cdd461ca792f240fbf471df90be579/transition-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/0e9fbbedd762ebddfde7f27fd67d10ba/loader-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1b9e12c96861d7bb9289410423d91fc8/viewpager-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4baa7647ca8676afe9c0c9ca4b03e48a/coordinatorlayout-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/92527c141e9af6d5ba7111bf306bcd00/drawerlayout-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8c998c48ae565bd10f30411f176badff/slidingpanelayout-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/17087f859076f08a18d04f01933b9ea0/customview-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1460f7492d690193072cdc1e4d5f493d/swiperefreshlayout-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/acb1841bea1fd042aa955a5fc25120a5/asynclayoutinflater-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/571d2d2f77a68cdc1b3d0f57095cead2/support-compat-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/66e058fb916db2946b1b0926fe9b4755/versionedparcelable-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/38434fc4a6619a73b2b72ee7482f02f6/cursoradapter-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/fd65987a85161a396d1b1c7e572982fb/exifinterface-27.1.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/5849346bd8986e1dc5af6b43fe6c118c/runtime-1.1.1/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a2ff984d9f86715cf00eeb8b6a228257/documentfile-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/11002e29f58c1a3e99a3dada9ac1e680/localbroadcastmanager-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/720e376f1d73e2e1ff5f94558f32db9d/print-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/ad55dbb896c17fd0be3180be64e52c96/viewmodel-1.1.1/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1c621ce31a615c09ae2edbf0b62b5edf/interpolator-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/27b21e72c8fa18d59e59bc68ead1366d/livedata-1.1.1/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/16b022f6222d778d50c20a4647255f26/livedata-core-1.1.1/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/6ba4da1dc26f5cc392fafb612b33dde3/runtime-1.1.1/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/86474da3033ae8d95286820c9413c3bd/constraint-layout-1.1.3/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/23.0/c947004bb13d18182be60077ade044099e4f26f1/guava-23.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/1.3.9/40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf/jsr305-1.3.9.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.0.18/5f65affce1684999e2f4024983835efc3504012e/error_prone_annotations-2.0.18.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog/0.5.0/9ac5b435edc23482abd2815884805352820e4038/ealvalog-0.5.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog-core/0.5.0/b218daf48ae873b529c4e865562e6ba1d319be2f/ealvalog-core-0.5.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/32a6f2fd82177fa050013d2399348c09/XPopupWindow-1.0.1/jars/classes.jar:/home/brahmix/Android/Sdk/platforms/android-28/android.jar:/home/brahmix/Android/Sdk/build-tools/28.0.3/core-lambda-stubs.jar" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bb8488788503b8cd5695ca9b42c24cb4/ealvalog-android-0.5.0/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.50/50ad05ea1c2595fb31b800e76db464d08d599af3/kotlin-stdlib-jdk7-1.3.50.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/746373d9bb5d2847c635f69f30e8e6c8/anko-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvatag/0.4.3/3c93057202a128c3dfde894b9050d043eb49d908/ealvatag-0.4.3.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/801d86a3f9a129323d8c786c4d6ba346/picasso-2.71828/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/7ef0f1d95bf4c0b3ba30bbae25e0e562b05cf75e/okhttp-3.10.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.0/7e006aaf475d67f9521f04dcbe8865361300f4f1/okio-jvm-2.4.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f3526847558421d7be29069614a95f06/anko-sqlite-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/5a6fb5ec6de7ecb19f5d15c8e34e0ff1/anko-sdk27-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/383973069d3f0771c8544b869eb46e65/anko-sdk27-coroutines-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/ef280b3f04d336c753ffb84d9680e18c/anko-appcompat-v7-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9d333341a07697ba76dce31b50371a33/anko-support-v4-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/7855097bc6583aaed9a1ab6b197b79d1/anko-appcompat-v7-coroutines-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/377850cc684b95d7d96577c55078b42a/anko-appcompat-v7-commons-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/bb6c0c160da72f3f25e56facfec807f2/anko-support-v4-commons-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e8dfe65d4d95a32181950bb16eba586d/anko-commons-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/87f134ca51f8986f93e20480c978a028/anko-coroutines-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/3e0df6c358bae9e624b349ff485418f9/sqlite-base-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/6a0be88e1b0bfbd66f2cb1bc87c2d867/platform-base-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/39ac3dfb7e32b3fe44c157c742509500/appcompatV7-base-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4053d6dbc908f798d8e2441414147a36/supportV4-base-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/66ebfec852bd365d06cf30471d7c6895/commons-base-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/2102040565a29061ab7aaea6ea548ad51eafb11d/kotlinx-coroutines-android-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/a33c4bf7581f71f01d4ed660b09ca199abbb44da/kotlinx-coroutines-core-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.50/b529d1738c7e98bbfa36a4134039528f2ce78ebf/kotlin-stdlib-1.3.50.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/5f7551ec1edc068deaa0397100a1f14f32270274/kotlinx-coroutines-core-common-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.50/3d9cd3e1bc7b92e95f43d45be3bfbcf38e36ab87/kotlin-stdlib-common-1.3.50.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/16.0.2/dab5655eb9abe23f2245c34e66c9813c7daf4563/annotations-16.0.2.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/2cceb2ce8c89f797eb3732ae151c5eed/design-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/40c172b322ab2cbaa5b264bd61fb1fe7/appcompat-v7-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/bbceac5ea10b377f4a1bfe0ef27e24c2/cardview-v7-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8cb7bcedb8e3dca36a0b3cbbb9ea9648/support-v4-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1b2cfac5df8473d8ba6bf25b647ece81/support-fragment-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/02c7c6846dca5de6916e784b3b4c645f/animated-vector-drawable-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/420bf1ba9060f87a0d755513f44eccff/recyclerview-v7-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/95e05009c6f4970c7674399faa6801cb/support-core-ui-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/21da103b05e0da3ef0c3912db0f543eb/support-core-utils-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a9ef90871aedc840ef5b19c648c5ae85/support-vector-drawable-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/85bd6d9bdc03a21f96f63442247904c6/support-media-compat-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/6cba45a7aa40d0da266b0bba795099f0/transition-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/45258a756e6ebd4ac509787eddeba4a0/loader-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4058136cb75c11e77fd3f407a6252dc5/viewpager-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/b7b90df0ea12b43edfeb748d473f59b0/coordinatorlayout-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f64e093468ab77842c0a17619bdda714/drawerlayout-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f6bf15b8ac7305beb683644a8b84171b/slidingpanelayout-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1e72ebf55c3ee4943e8d88d925c3a67c/customview-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/bb36339521ed6409a2d50bed502cff2a/swiperefreshlayout-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/6bbb494af45561416a0fd17eba96f4cd/asynclayoutinflater-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/55bb126aa8799a19185c1769b3802de6/support-compat-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9b9c4c649b4547a1a2a29a66e60463ed/versionedparcelable-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/fa3e9f44740e16b967ad338590f640f9/cursoradapter-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/753644a8a421231bd03dae601286f889/exifinterface-27.1.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f304d26e81c2ac674c8d718020f44ce2/runtime-1.1.1/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/b1f429bc867e6bef343718a928b27bcf/documentfile-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/c9a4cff7d801afcde38a15c849aba7d3/localbroadcastmanager-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1d60f7a1f34b86e30b27d981246805b0/print-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e8486cfa145a085ddb7749e90b86cd7a/viewmodel-1.1.1/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a7cc930c6c85553baec9442768e9910e/interpolator-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/620dcdd05acbf60c6f21b269ddbcc44d/livedata-1.1.1/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/d9480822a420f8b71d4809310057ac98/livedata-core-1.1.1/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/6ed36e64d19fbb140eab41e81e83fb81/runtime-1.1.1/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/01a8c0061e5c8e400c59b1da7fe6af7f/constraint-layout-1.1.3/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/23.0/c947004bb13d18182be60077ade044099e4f26f1/guava-23.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/1.3.9/40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf/jsr305-1.3.9.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.0.18/5f65affce1684999e2f4024983835efc3504012e/error_prone_annotations-2.0.18.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog/0.5.0/9ac5b435edc23482abd2815884805352820e4038/ealvalog-0.5.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog-core/0.5.0/b218daf48ae873b529c4e865562e6ba1d319be2f/ealvalog-core-0.5.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e18d3506cbad107043af39fb3ff623f0/XPopupWindow-1.0.1/jars/classes.jar:/home/brahmix/Android/Sdk/platforms/android-28/android.jar:/home/brahmix/Android/Sdk/build-tools/28.0.3/core-lambda-stubs.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_debug" />
diff --git a/app/build.gradle b/app/build.gradle
index be92790..b80740c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,7 +21,8 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
-                cppFlags "-std=c++14"
+                arguments "-DANDROID_STL=c++_shared", "-DANDROID=true"
+                cppFlags "-std=c++17"
             }
         }
 
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index 49d0830..4e5ed9d 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -13,6 +13,8 @@ cmake_minimum_required(VERSION 3.4.1)
 
 # set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
 
+set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=c++17")
+
 set (SOURCES
         Demo.cpp
         SongRepository.cpp
diff --git a/app/src/main/cpp/Demo.cpp b/app/src/main/cpp/Demo.cpp
index 6b58057..c0064e5 100644
--- a/app/src/main/cpp/Demo.cpp
+++ b/app/src/main/cpp/Demo.cpp
@@ -20,12 +20,33 @@
 
 #include "model/Song.h"
 #include "model/User.h"
+#include "SongRepository.h"
 #include "Tok.h"
 
 
+model::Song retrieveSong(const std::string&);
+
 std::string fetchToken(const std::string&, const std::string&, const std::string&);
 
 
+model::Song retrieveSong(const std::string& token)
+{
+    repository::SongRepository songRepo;
+    model::Song song;
+    song.id = 2;
+    song.title = "Smooth";
+    song.album = "Amaze";
+    song.artist = "The Herb";
+    song.genre = "Blazing";
+    song.duration = 420;
+    song.year = 420;
+
+    song = songRepo.retrieveSong(token, song.id);
+
+    return song;
+}
+
+
 std::string fetchToken(const std::string& username, const std::string& password,
     const std::string& apiUri)
 {
@@ -57,3 +78,49 @@ Java_com_example_mear_activities_DemoStreamActivity_logUser(
 
     return env->NewStringUTF(token.c_str());
 }
+
+
+extern "C"
+JNIEXPORT jobject
+JNICALL
+Java_com_example_mear_activities_DemoStreamActivity_retrieveSong(
+        JNIEnv *env,
+        jobject thisObj,
+        jstring token
+        )
+{
+    const std::string tok = env->GetStringUTFChars(token, NULL);
+
+    auto song = retrieveSong(tok);
+    std::string bank = "SBI Bank";
+
+    jclass songClass = env->FindClass( "com/example/mear/models/Song");
+    jmethodID jconstructor = env->GetMethodID( songClass,  "<init>", "()V" );
+    jobject songObj = env->NewObject( songClass, jconstructor );
+
+    jmethodID songId = env->GetMethodID( songClass,  "setId", "(I)V" );
+    jmethodID songTitle = env->GetMethodID( songClass,  "setTitle", "(Ljava/lang/String;)V" );
+    jmethodID songAlbum = env->GetMethodID( songClass,  "setAlbum", "(Ljava/lang/String;)V" );
+    jmethodID songArtist = env->GetMethodID( songClass,  "setArtist", "(Ljava/lang/String;)V" );
+    jmethodID songGenre = env->GetMethodID( songClass,  "setGenre", "(Ljava/lang/String;)V" );
+    jmethodID songDuration = env->GetMethodID( songClass,  "setDuration", "(I)V" );
+    jmethodID songYear = env->GetMethodID( songClass,  "setYear", "(I)V" );
+
+    jint id = song.id;
+    jstring title = env->NewStringUTF(song.title.c_str());
+    jstring album = env->NewStringUTF(song.album.c_str());
+    jstring artist = env->NewStringUTF(song.artist.c_str());
+    jstring genre = env->NewStringUTF(song.genre.c_str());
+    jint duration = song.duration;
+    jint year = song.year;
+
+    env->CallVoidMethod( songObj, songId, id );
+    env->CallVoidMethod(songObj, songTitle, title);
+    env->CallVoidMethod(songObj, songAlbum, album);
+    env->CallVoidMethod(songObj, songArtist, artist);
+    env->CallVoidMethod(songObj, songGenre, genre);
+    env->CallVoidMethod(songObj, songDuration, duration);
+    env->CallVoidMethod(songObj, songYear, year);
+
+    return songObj;
+}
diff --git a/app/src/main/cpp/SongRepository.cpp b/app/src/main/cpp/SongRepository.cpp
index 6180b27..d44e17f 100644
--- a/app/src/main/cpp/SongRepository.cpp
+++ b/app/src/main/cpp/SongRepository.cpp
@@ -4,6 +4,9 @@
 
 #include "SongRepository.h"
 
+#include <curl/curl.h>
+#include <nlohmann/json.hpp>
+
 namespace repository {
     // TODO: implement this
     std::vector<model::Song> SongRepository::fetchSongs(const std::string& token,
@@ -13,4 +16,59 @@ namespace repository {
 
       return songs;
     }
+
+
+    model::Song SongRepository::retrieveSong(const std::string& token, const int id) {
+        std::string uri;
+        uri.append(std::to_string(id));
+        model::Song song;
+
+        CURL *curl;
+        CURLcode res;
+        struct curl_slist *chunk = NULL;
+        curl = curl_easy_init();
+
+        if (!curl) {
+            return song;
+        }
+
+        auto resp = std::make_unique<char[]>(10000);
+
+        std::string authInfo("Authorization: Bearer ");
+        authInfo.append(token);
+        chunk = curl_slist_append(chunk, authInfo.c_str());
+
+        curl_easy_setopt(curl, CURLOPT_URL, uri.c_str());
+        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk);
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, respBodyRetriever);
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, resp.get());
+        curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
+
+        res = curl_easy_perform(curl);
+        curl_easy_cleanup(curl);
+
+        if (res == CURLE_OK) {
+            auto s = nlohmann::json::parse(resp.get());
+            song.id = s["id"].get<int>();
+            song.title = s["title"].get<std::string>();
+            song.album = s["album"].get<std::string>();
+            song.artist = s["artist"].get<std::string>();
+            song.genre = s["genre"].get<std::string>();
+            song.duration = s["duration"].get<int>();
+            song.year = s["year"].get<int>();
+
+            return song;
+        }
+
+        return song;
+    }
+
+
+    size_t SongRepository::respBodyRetriever(void* ptr, size_t size, size_t nmemb, char *e)
+    {
+        std::memcpy(e, ptr, nmemb);
+        e[nmemb] = '\0';
+
+        return nmemb;
+    }
 }
diff --git a/app/src/main/cpp/SongRepository.h b/app/src/main/cpp/SongRepository.h
index 5c8db05..5808622 100644
--- a/app/src/main/cpp/SongRepository.h
+++ b/app/src/main/cpp/SongRepository.h
@@ -15,7 +15,10 @@ namespace repository {
     class SongRepository {
     public:
         std::vector<model::Song> fetchSongs(const std::string&, const std::string&);
+
+        model::Song retrieveSong(const std::string&, const int);
     private:
+        static size_t respBodyRetriever(void*, size_t, size_t, char*);
     };
 }
 
diff --git a/app/src/main/cpp/Tok.cpp b/app/src/main/cpp/Tok.cpp
index 125acfd..0105850 100644
--- a/app/src/main/cpp/Tok.cpp
+++ b/app/src/main/cpp/Tok.cpp
@@ -4,6 +4,7 @@
 
 #include "Tok.h"
 
+#include <memory>
 #include <cstring>
 
 #include <curl/curl.h>
@@ -20,7 +21,7 @@ namespace manager {
             return "none";
         }
 
-        char resp[2048];
+        auto resp = std::make_unique<char[]>(10000);
 
         const auto loginUri = fetchLoginUri(uri);
         const auto obj = userJsonString(user);
@@ -28,14 +29,14 @@ namespace manager {
         curl_easy_setopt(curl, CURLOPT_URL, loginUri.c_str());
         curl_easy_setopt(curl, CURLOPT_POSTFIELDS, obj.c_str());
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, respBodyRetriever);
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, resp);
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, resp.get());
         curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
 
         res = curl_easy_perform(curl);
         curl_easy_cleanup(curl);
 
         if (res == CURLE_OK) {
-            auto s = nlohmann::json::parse(resp);
+            auto s = nlohmann::json::parse(resp.get());
             return s["token"].get<std::string>();
         }
 
diff --git a/app/src/main/cpp/Tok.h b/app/src/main/cpp/Tok.h
index 87ab2cd..aab9fe1 100644
--- a/app/src/main/cpp/Tok.h
+++ b/app/src/main/cpp/Tok.h
@@ -5,6 +5,7 @@
 #ifndef MEAR_TOK_H
 #define MEAR_TOK_H
 
+#include <memory>
 #include <string>
 
 #include "model/User.h"
diff --git a/app/src/main/java/com/example/mear/activities/DemoStreamActivity.kt b/app/src/main/java/com/example/mear/activities/DemoStreamActivity.kt
index eacce78..f32a864 100644
--- a/app/src/main/java/com/example/mear/activities/DemoStreamActivity.kt
+++ b/app/src/main/java/com/example/mear/activities/DemoStreamActivity.kt
@@ -9,6 +9,8 @@ import kotlinx.android.synthetic.main.activity_demo_stream.*
 import kotlinx.android.synthetic.main.content_demo_stream.*
 import org.jetbrains.anko.toast
 
+import com.example.mear.models.Song
+
 class DemoStreamActivity : AppCompatActivity() {
 
     companion object {
@@ -18,7 +20,11 @@ class DemoStreamActivity : AppCompatActivity() {
     }
 
 
+    private var token: String? = null
+
+
     private external fun logUser(usr: String, pass: String, api: String): String
+    private external fun retrieveSong(tok: String): Song
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -50,8 +56,9 @@ class DemoStreamActivity : AppCompatActivity() {
         var passwordStr = password.text.toString()
         var apiUriStr = apiUri.text.toString()
 
-        var token = logUser(usernameStr, passwordStr, apiUriStr)
-        toast(token).show()
+        token = logUser(usernameStr, passwordStr, apiUriStr)
+        toast(token!!).show()
+        var s = retrieveSong(token!!);
     }
 
     private fun validFields(): Boolean {
diff --git a/app/src/main/java/com/example/mear/models/Song.kt b/app/src/main/java/com/example/mear/models/Song.kt
new file mode 100644
index 0000000..ac4b124
--- /dev/null
+++ b/app/src/main/java/com/example/mear/models/Song.kt
@@ -0,0 +1,4 @@
+package com.example.mear.models
+
+class Song (var id: Int = 3, var title: String = "", var album: String = "", var artist: String = "",
+            var genre: String = "", var year: Int = 0, var duration: Int = 0)
diff --git a/build.gradle b/build.gradle
index 89f7f4c..8bc2ea4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files