diff --git a/.gradle/4.10.1/fileHashes/fileHashes.bin b/.gradle/4.10.1/fileHashes/fileHashes.bin
index f5262730b38d00960995504e9fcc4f91f7f52a8c..7af80191ccb942bfb57564a861bdc9386186ebc5 100644
Binary files a/.gradle/4.10.1/fileHashes/fileHashes.bin and b/.gradle/4.10.1/fileHashes/fileHashes.bin differ
diff --git a/.gradle/4.10.1/fileHashes/fileHashes.lock b/.gradle/4.10.1/fileHashes/fileHashes.lock
index ad7f179e197646f427c5c08f025b90e936a8db34..56d4c65d0a3d52ae31faffb446f052276bbbd39f 100644
Binary files a/.gradle/4.10.1/fileHashes/fileHashes.lock and b/.gradle/4.10.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/4.10.1/taskHistory/taskHistory.bin b/.gradle/4.10.1/taskHistory/taskHistory.bin
index 1591a4f8abe3521390c8fcc5e5f946f87befced7..1379ec7993f6d928dcc340a5418c07d072b40afa 100644
Binary files a/.gradle/4.10.1/taskHistory/taskHistory.bin and b/.gradle/4.10.1/taskHistory/taskHistory.bin differ
diff --git a/.gradle/4.10.1/taskHistory/taskHistory.lock b/.gradle/4.10.1/taskHistory/taskHistory.lock
index 7eb6c79244a978656001eb7daddc7047433ca214..616b59302fce2a30e707e0d6bdc57cb0606b4b8a 100644
Binary files a/.gradle/4.10.1/taskHistory/taskHistory.lock and b/.gradle/4.10.1/taskHistory/taskHistory.lock differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index a1590a77909de06bc6cda142e76766f29024a234..dc585bc444e23c491a2a586f83d5969c1873ecba 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
index 3f8065982531ea7a09597d95e25550c76dd28188..c02b058652a19efb22a5b8a5641ba313ebbbfa8d 100644
--- a/.gradle/buildOutputCleanup/cache.properties
+++ b/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Wed Apr 10 20:48:29 BST 2019
-gradle.version=4.10.1
+#Fri Apr 19 19:30:17 BST 2019
+gradle.version=5.1.1
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index fa6dd3bf6637a96e76b7a8ecaa1e730711952447..4966d303ba5262255ee0f788fe86554b15241141 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 788f9f4aab9148bb6fa3055c42c78a14292455a6..a55f70b58e33e580bdc871a0ef8a9ae12f1f1c48 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
index 01d8b70080d2163358cc27bc29e50b5567e5cab7..3517d71c7fceb2631048f77edfb40aba75e43efe 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 30aa626c23142d59e94cc76327172301f159b618..0000000000000000000000000000000000000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
-  </code_scheme>
-</component>
\ No newline at end of file
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 49caf7668ed90642e3aac7dc1b8be7f2d7b978a1..a49b56c1933b962489a3edbf1da8ffaeb16c5fe5 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-1/files-1.1/runtime-1.1.1.aar/28c7e1a8e07e4c169c084ff575626bbe/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/28c7e1a8e07e4c169c084ff575626bbe/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7217d8a7df2385d88b1f1972965cc33/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7217d8a7df2385d88b1f1972965cc33/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 6ff982cb957827f605fe1d7a36f92b3ade02cb96..02127af9c14277ca47e02d44593c0bb4c8deb476 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="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/a918d791aa0cbd38d7e4e33c66e7f42a/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/a918d791aa0cbd38d7e4e33c66e7f42a/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec05876a33821c3a47b4f2c5f12f4a7e/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec05876a33821c3a47b4f2c5f12f4a7e/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 2abaf102eedab355b2b22f9f58fc6dba533a97a9..1b3aa43c975b8b55dfd113e154c6d4af5b62d965 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-1/files-1.1/livedata-core-1.1.1.aar/014d518d802dd5a39e2136bea88fa746/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/014d518d802dd5a39e2136bea88fa746/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/35e57b88abfeeb3cdd5ddccb109e102b/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/35e57b88abfeeb3cdd5ddccb109e102b/jars/classes.jar!/" />
     </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 1095fe4c9cea5c19f7a62423fa90be3b36b6ae48..03c8d9c91598c72c69e26ec885fb1ec2771054c5 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-1/files-1.1/runtime-1.1.1.aar/4bfabc861affcb80c5d15930f2fabfbc/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/4bfabc861affcb80c5d15930f2fabfbc/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eb14b8321ab26f415f4ac545822fba54/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eb14b8321ab26f415f4ac545822fba54/jars/classes.jar!/" />
     </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 a5d6fc31acd6929347e3dc3696eca7835987144c..33b5f7a4fae2990615103ae6d97827e2312437bf 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="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/2312e96b961995c17d4c531952f06e28/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/2312e96b961995c17d4c531952f06e28/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b1672fb793b30bd63e2a36eaea28ee57/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b1672fb793b30bd63e2a36eaea28ee57/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 9e337f5bbdc0eecf780122fe8745a0bbc665afe0..46a10db68bac652d658efecca189aca9c898bce4 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-1/files-1.1/animated-vector-drawable-28.0.0.aar/be96b3161887e668ed667d787c3e3a54/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0.aar/be96b3161887e668ed667d787c3e3a54/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/33eb809e364d149fcbf7a67fe8a28896/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/33eb809e364d149fcbf7a67fe8a28896/jars/classes.jar!/" />
     </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 6ef60be651aa555144e77d303518f4ba45927511..94f0c579e094481bfa25fcb979a3d628225ec438 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-1/files-1.1/appcompat-v7-28.0.0.aar/91d8b22e7b9066d967ccd80eb235acc7/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6f43171b0e4a2a148faffa75382b8561/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/91d8b22e7b9066d967ccd80eb235acc7/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/91d8b22e7b9066d967ccd80eb235acc7/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6f43171b0e4a2a148faffa75382b8561/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6f43171b0e4a2a148faffa75382b8561/jars/classes.jar!/" />
     </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 2960357e8e1e984e0fea1fdb362e02a20c5f41d8..2b8d6fa9e08279dcef0bd8615a74ae802e93df58 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="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/a0389018bc47350a1e49040ad8718e16/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/a0389018bc47350a1e49040ad8718e16/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ae46894ec2683176e675c2580d2a2dcc/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ae46894ec2683176e675c2580d2a2dcc/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 582de239de638d3ad72fb38a428f08fada696331..60b8e110c6f6b8dd4142e292593679565a221e13 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-1/files-1.1/cardview-v7-28.0.0.aar/1caa07da23f68d2c6098b80eb634b850/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-28.0.0.aar/1caa07da23f68d2c6098b80eb634b850/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a39fc90c2d9df1e4c804b2ff6be14fb5/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a39fc90c2d9df1e4c804b2ff6be14fb5/jars/classes.jar!/" />
     </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 8824bdefd7e6d91ae41e49e40d390220d7d147e9..236475046730dd7f512dc47fa1634fdd634bdc3b 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-1/files-1.1/constraint-layout-1.1.3.aar/e1b2f01ce021954de721ac9c85d3674d/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.3.aar/e1b2f01ce021954de721ac9c85d3674d/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/66e9857737885ddd50fab9e72934919e/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/66e9857737885ddd50fab9e72934919e/jars/classes.jar!/" />
     </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 4d58dab0b28b36d403205cb82fedcfc9e258949b..6f3352fa09e028c3b2434cdc41369572da0c6f58 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-1/files-1.1/coordinatorlayout-28.0.0.aar/847a82178e7768efc46a759ff60ece98/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f1b583b97153a1d13d69b281e668eeaf/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/847a82178e7768efc46a759ff60ece98/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/847a82178e7768efc46a759ff60ece98/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f1b583b97153a1d13d69b281e668eeaf/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f1b583b97153a1d13d69b281e668eeaf/jars/classes.jar!/" />
     </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 2a22525b8d660af0af84539dec35b7c8e5a4ffbc..de4d98f464932d7605486a74c59e99b72e191c14 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-1/files-1.1/cursoradapter-28.0.0.aar/70a68d6970d580cd710aa1bb2cc58d44/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0.aar/70a68d6970d580cd710aa1bb2cc58d44/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/774e653c7076b9e80d4e673ba6d75934/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/774e653c7076b9e80d4e673ba6d75934/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 ea452733348f6ed5b992a5192f11dd4ca0591770..554311c7ec6b5e06e4fa3c7b0484c4bd0b143cfe 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="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-28.0.0.aar/82f88f2f2781e38529a33c5ddf354fad/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-28.0.0.aar/82f88f2f2781e38529a33c5ddf354fad/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0716fd665728f35d644ce6801c4321be/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0716fd665728f35d644ce6801c4321be/jars/classes.jar!/" />
     </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 058d4326d23cbccf960f1e9b4391188b5e21b2dd..2d256f21f13332797c5321a47a062fd4a643aaab 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-1/files-1.1/design-28.0.0.aar/411fe12c49339ed00fe64d03418a72b2/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5740e154ce5fe1db59c846b257d27be2/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-28.0.0.aar/411fe12c49339ed00fe64d03418a72b2/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-28.0.0.aar/411fe12c49339ed00fe64d03418a72b2/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5740e154ce5fe1db59c846b257d27be2/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5740e154ce5fe1db59c846b257d27be2/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 ca7fa2eed5edc6ca5f8a382f332b72216f0f86da..70f253c0142bb3988d8ee08cbefa3c0ed78d64cf 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-1/files-1.1/documentfile-28.0.0.aar/2bbe54daefcc73497554f0a1f69def93/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0.aar/2bbe54daefcc73497554f0a1f69def93/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8775fbeeb3a7f185677bcbc954207231/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8775fbeeb3a7f185677bcbc954207231/jars/classes.jar!/" />
     </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 4e39179cd9466c11428f2550808726ec592abcef..f5db4ed9220f8fc21db0c207046716095d46f088 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-1/files-1.1/drawerlayout-28.0.0.aar/a95f385d9b953199639b050562cae96d/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c270cdabc9c8d5e31e04f70d502c1a6/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/a95f385d9b953199639b050562cae96d/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/a95f385d9b953199639b050562cae96d/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c270cdabc9c8d5e31e04f70d502c1a6/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c270cdabc9c8d5e31e04f70d502c1a6/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 d599f6d29b07558664c6816da20fcae4160002f1..32707cb011622190befaf015f0d19b3c668e088c 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-1/files-1.1/interpolator-28.0.0.aar/315f6c61801c44dc6320654779759f5e/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0.aar/315f6c61801c44dc6320654779759f5e/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/78e59a0c377474421a76602a3cbfd261/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/78e59a0c377474421a76602a3cbfd261/jars/classes.jar!/" />
     </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 476873397baf08445b84367d9d6e54f17cc4a797..38e76c5d06eaa2a810be719b5dbc0630aefc765d 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="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-28.0.0.aar/40bc5e9d4aaa37fd0f52a67120ece74e/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-28.0.0.aar/40bc5e9d4aaa37fd0f52a67120ece74e/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/13206e5f047b63943fd8f752a000ee37/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/13206e5f047b63943fd8f752a000ee37/jars/classes.jar!/" />
     </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 59e94ca4801a41e95f601df13018d2186d0731eb..b8f5ef68b88ff2406ecf2a79e27565811d7033e8 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="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0.aar/ab4499d360e4d535c2a351a89b3cec69/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0.aar/ab4499d360e4d535c2a351a89b3cec69/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fa002bc16854aa2990e3269befbab17/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fa002bc16854aa2990e3269befbab17/jars/classes.jar!/" />
     </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 2a1befd37788637d058df6b73d7f4bb09596e98c..b5535877e6536ce91a0869b499d5643c7363e5cd 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-1/files-1.1/print-28.0.0.aar/3ca07441b2b1a8bcfd291367d227ab8c/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/14c6b0493e7b32c2a048840435bc0f7b/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/3ca07441b2b1a8bcfd291367d227ab8c/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/3ca07441b2b1a8bcfd291367d227ab8c/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/14c6b0493e7b32c2a048840435bc0f7b/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/14c6b0493e7b32c2a048840435bc0f7b/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 5f44e689fa74413a4b4a5593a45b06e2b07c162c..ebf93d92d76ba4cc2d8ea56b9ea9320c611ae68c 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-1/files-1.1/recyclerview-v7-28.0.0.aar/0bbe1a44ac6a3f0c1d47daa0a65d3aef/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2f381d6bebe5090a25f5e8535b82a456/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-28.0.0.aar/0bbe1a44ac6a3f0c1d47daa0a65d3aef/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-28.0.0.aar/0bbe1a44ac6a3f0c1d47daa0a65d3aef/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2f381d6bebe5090a25f5e8535b82a456/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2f381d6bebe5090a25f5e8535b82a456/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 eecaf1d68a0880cd50a6c181afa4ad5a366bd9a1..86ff241f7bb02318b33522758808c02fc8060ae3 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-1/files-1.1/slidingpanelayout-28.0.0.aar/c88792b14f1c09e5307d03155a312f40/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-28.0.0.aar/c88792b14f1c09e5307d03155a312f40/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0631551907b87be442e1e161e2c42193/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0631551907b87be442e1e161e2c42193/jars/classes.jar!/" />
     </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 23bee6f44b9eddc0d370dfa0a271bc196be19a5a..c85a6f0e8f7fddf32de275d71da932a3af909d11 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-1/files-1.1/support-compat-28.0.0.aar/1a189b4be7f195994524695fad760dcb/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/491e55b5cb53f8e1150b3e4a9f7afb18/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/1a189b4be7f195994524695fad760dcb/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/1a189b4be7f195994524695fad760dcb/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/491e55b5cb53f8e1150b3e4a9f7afb18/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/491e55b5cb53f8e1150b3e4a9f7afb18/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 c2f86e8dd22011896d8e28612d534ddd8ff8723e..449c7eda54a52be9a3c355ae9701c9193ef20824 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-1/files-1.1/support-core-ui-28.0.0.aar/4ed1b353222d209a79292aef2e2ff890/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-28.0.0.aar/4ed1b353222d209a79292aef2e2ff890/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4ae816e1df7411a543526a4777ca16bd/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4ae816e1df7411a543526a4777ca16bd/jars/classes.jar!/" />
     </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 c9d818e6e5e3cbcb642cfe81030604f0deff04f5..29ce523049b0bcabb99f1e19c658b4a7e8dbeaaa 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-1/files-1.1/support-core-utils-28.0.0.aar/cad80fce83884e8d036ea19e4b6071ab/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-28.0.0.aar/cad80fce83884e8d036ea19e4b6071ab/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/172a39e505c0043ada6580f16087e1be/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/172a39e505c0043ada6580f16087e1be/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 abfee30e22393f580e37530a898950b61664a05f..aaa8759f57ad9cdbee8b8e571663b5a115784c9b 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-1/files-1.1/support-fragment-28.0.0.aar/e0c4c77a6b4d3b30b21f78c00bdf69bb/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cd859756b99521dfb204a563ee458385/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/e0c4c77a6b4d3b30b21f78c00bdf69bb/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/e0c4c77a6b4d3b30b21f78c00bdf69bb/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cd859756b99521dfb204a563ee458385/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cd859756b99521dfb204a563ee458385/jars/classes.jar!/" />
     </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 4e55e7e7efe74999d8ba67eca6391e832039abde..1fc0fc47c34dfa7b9442bdb7e73fa7b51e7cffbf 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-1/files-1.1/support-media-compat-28.0.0.aar/fe351ca3faff697d7896100c4ca61714/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d7a65d4039958b7f5739cf73b1a2872/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-28.0.0.aar/fe351ca3faff697d7896100c4ca61714/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-28.0.0.aar/fe351ca3faff697d7896100c4ca61714/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d7a65d4039958b7f5739cf73b1a2872/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d7a65d4039958b7f5739cf73b1a2872/jars/classes.jar!/" />
     </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 976f2c8c0bbb7f5365e0d177741c982d35b27662..d49d92fdffa595ccf2bdb27968554466813a4017 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-1/files-1.1/support-v4-28.0.0.aar/5562a1df1e7d7fd05ca4d6ec6b7cad51/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-28.0.0.aar/5562a1df1e7d7fd05ca4d6ec6b7cad51/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/deb8728fd354da615083f30e62568af9/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/deb8728fd354da615083f30e62568af9/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 0b3171a51c078543182b3acfdd89ba35b3ccef9a..0fb8f9daaf2a07339c716269d7556281eb6947db 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-1/files-1.1/support-vector-drawable-28.0.0.aar/9ce385449b5c6f232b2df84ef0782d10/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0.aar/9ce385449b5c6f232b2df84ef0782d10/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fe1222057e110bd5ecac64f3524f1d67/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fe1222057e110bd5ecac64f3524f1d67/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 01dcc5f02c494bef3fef5dd84c43bc79bbac7078..b5e220dd56fa50ea3c8eca135cf2243745510533 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-1/files-1.1/swiperefreshlayout-28.0.0.aar/93720cd3d1ec65fabcc6a059f6448c06/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f6e1636ffa35beca9a5cbd58f633d442/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/93720cd3d1ec65fabcc6a059f6448c06/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/93720cd3d1ec65fabcc6a059f6448c06/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f6e1636ffa35beca9a5cbd58f633d442/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f6e1636ffa35beca9a5cbd58f633d442/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 c16550a40aacfb134cde3e4718bfc045ee06029f..8c847a548660ae821129eaffd1894cae33ec95f1 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="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-3.0.2.aar/e70828df4593ab4af94e47a6370ea0d1/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-3.0.2.aar/e70828df4593ab4af94e47a6370ea0d1/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c23c277029c755c33e49f20a5ed7b063/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c23c277029c755c33e49f20a5ed7b063/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
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 9a68cf6f0194d0ac9d6de9a6aeb867f7d942e580..c328e21a22567ca9a49205da302fb471aab93f71 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="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-3.0.2.aar/3da520c5d43da0f4290217baf71715bf/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-3.0.2.aar/3da520c5d43da0f4290217baf71715bf/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/09b4b6b7f3d781fdf7ba93327adf1fd6/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/09b4b6b7f3d781fdf7ba93327adf1fd6/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
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 3025b6ad6d6d77e8b09ac97f6ce7266fb6d6d6ac..bccc6fb0ce2ea2fd47bfd6180a1927d5f26a353d 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-1/files-1.1/monitor-1.0.2.aar/1ababdb5d6b4eb4edcffcf3afc313ec4/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/monitor-1.0.2.aar/1ababdb5d6b4eb4edcffcf3afc313ec4/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bfb196c061562a4c85a5941d75dfa2f8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bfb196c061562a4c85a5941d75dfa2f8/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
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 4a5509887e8ed1daef9a97728090c3ffe4d49ea5..2b6a9a0fd146f476d59761165890d3b1ea57e99f 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="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-1.0.2.aar/4cd770e15d5359e6072fdbdaaa85dd89/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-1.0.2.aar/4cd770e15d5359e6072fdbdaaa85dd89/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/71d3d4f5cd9058f56ad65968850312cb/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/71d3d4f5cd9058f56ad65968850312cb/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
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 caab2949cc1f9015c2a743ee07878fb689231b92..b7fc485cabda68b86bc13e7b2a9a38faf59d0aba 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-1/files-1.1/transition-28.0.0.aar/7a7e09bef1c9ad70e0eaccf0d4d6367a/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c3f32d85a9669233bd8fc137b1a5c8ee/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-28.0.0.aar/7a7e09bef1c9ad70e0eaccf0d4d6367a/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-28.0.0.aar/7a7e09bef1c9ad70e0eaccf0d4d6367a/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c3f32d85a9669233bd8fc137b1a5c8ee/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c3f32d85a9669233bd8fc137b1a5c8ee/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 8d8e914f1c918a7a8b4535ff5bc15ad73c1fea84..7e1017a89ed68727556bf8e420e8f944f5b6a346 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-1/files-1.1/versionedparcelable-28.0.0.aar/c5d91209ff08d77fa4ad755165d1d52c/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/c5d91209ff08d77fa4ad755165d1d52c/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c671b64dc14895f35a2bc124cdcc605/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c671b64dc14895f35a2bc124cdcc605/jars/classes.jar!/" />
     </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 5f31fcd650cf08e5c634af2ad50650f87b43e303..3e08ac7675d7a28bd938a12222567c187d5072ee 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-1/files-1.1/viewpager-28.0.0.aar/fc71744fd9805ade4e66caf1d0094b74/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewpager-28.0.0.aar/fc71744fd9805ade4e66caf1d0094b74/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ee405f3565100ab6e2720621924b174/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ee405f3565100ab6e2720621924b174/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_16_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_16_0_0_aar.xml
index c08fd3bf2585d5447f707824b7acdc7d2f52cf54..fcbd1b37d5438965960b678452eb9601b8e4a7e4 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_16_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_16_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-ads-identifier:16.0.0@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-16.0.0.aar/e17e111518ecf65e40c0d6313c779b23/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-16.0.0.aar/e17e111518ecf65e40c0d6313c779b23/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7b59aeee1a47e5e18e722112ae4be749/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7b59aeee1a47e5e18e722112ae4be749/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_16_0_1_aar.xml
index 44a4e0fd19818f5b2f3d90b929d29b7444e536cc..281d8457aa30ffb40f3d55c06ebdd72c0ad6755b 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_16_0_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-base:16.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-base-16.0.1.aar/1cada4476e4543ad79fb3ee94da008eb/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-base-16.0.1.aar/1cada4476e4543ad79fb3ee94da008eb/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9da066987e2aeed293cf4e8dfbcd71b7/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9da066987e2aeed293cf4e8dfbcd71b7/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_16_2_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_16_2_0_aar.xml
index d81dc694a57e6b64bd0b2eb4644924c49fb740c2..0411787d4721acee9627603bb20449c4dc4296b9 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_16_2_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_16_2_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-basement:16.2.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-basement-16.2.0.aar/234788f0a71d811f01d897d0466f7ba6/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-basement-16.2.0.aar/234788f0a71d811f01d897d0466f7ba6/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/395b13f46faa04b229cd9f50343aa837/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/395b13f46faa04b229cd9f50343aa837/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-basement/16.2.0/3e3589bff6719404b47afecaa49d192cfa3f5791/play-services-basement-16.2.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_16_0_1_aar.xml
index 2954127e86055a73cc1a70ed27a6d116a892d7f0..1b5ac01f14c5826efe2416251a0a31f43de5bfbb 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_16_0_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-flags:16.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-flags-16.0.1.aar/97bdff162e3e6f0e5c810a47ee1ff548/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-flags-16.0.1.aar/97bdff162e3e6f0e5c810a47ee1ff548/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d5b69c651a72c17744b998825d436022/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d5b69c651a72c17744b998825d436022/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_maps_16_1_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_maps_16_1_0_aar.xml
index 0b97e5f89e9f878662be0292c83e0bf7e4919198..f19f9103d849d6be204966352680bb28add7b5c2 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_maps_16_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_maps_16_1_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-maps:16.1.0@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-maps-16.1.0.aar/a2393d1e18ea2b8493d0605db80fe140/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-maps-16.1.0.aar/a2393d1e18ea2b8493d0605db80fe140/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/781ea4ad1da28c0e6c7cb578017efe45/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/781ea4ad1da28c0e6c7cb578017efe45/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-maps/16.1.0/68568da8e0d63d5d6fc4b6dfe9e01edc038e6a43/play-services-maps-16.1.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_16_4_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_16_4_0_aar.xml
index d0d843eb359dbae92c4e8cbc351259039f258c2d..bf6084261670518413995b09fcc3c614d390bcce 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_16_4_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_16_4_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-measurement:16.4.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-measurement-16.4.0.aar/cc321c50f0704e3bd579ee402ca27d13/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-measurement-16.4.0.aar/cc321c50f0704e3bd579ee402ca27d13/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a94d3858dd71a1251385127e71775883/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a94d3858dd71a1251385127e71775883/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-measurement/16.4.0/6ffd880f8d48b22cade5f0a40bc63ec6bbd71818/play-services-measurement-16.4.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_16_4_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_16_4_0_aar.xml
index baab6e4a651541c0a43e892002d985da3b3eb383..bf62cef1546f2257a2ce96f7864fa1b081c8adc1 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_16_4_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_16_4_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-measurement-api:16.4.0@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-measurement-api-16.4.0.aar/68c1e56c5ef5b6585aee27bc582493ff/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-measurement-api-16.4.0.aar/68c1e56c5ef5b6585aee27bc582493ff/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d54729030a57dc51ec43900fbcdbf94d/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d54729030a57dc51ec43900fbcdbf94d/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-measurement-api/16.4.0/e3d686c60b90e01a909c923347c0e7aff8023b99/play-services-measurement-api-16.4.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_4_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_4_0_aar.xml
index 0d8b158128850ae7d95e3129a3b1bb7c9c1cb386..d7b0b4cbab3cb9186fb20cbf9338f5d1ea67aa06 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_4_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_4_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-measurement-base:16.4.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-measurement-base-16.4.0.aar/8ca0de3b51dfdcba8b398d7367efcc70/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-measurement-base-16.4.0.aar/8ca0de3b51dfdcba8b398d7367efcc70/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4621db08f79f5a75f2cd806718c7f44a/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4621db08f79f5a75f2cd806718c7f44a/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-measurement-base/16.4.0/8ff2fadcad61bc126ae562e28dedf98219fdc30d/play-services-measurement-base-16.4.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_impl_16_4_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_impl_16_4_0_aar.xml
index 48666196d5b61c49ba71e2d408e505517799162b..9032112f05ffea291a887ffdfb78c55efb8f7c20 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_impl_16_4_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_impl_16_4_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-measurement-impl:16.4.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-measurement-impl-16.4.0.aar/9ba44087e10314fcb21285fdcfa3f96b/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-measurement-impl-16.4.0.aar/9ba44087e10314fcb21285fdcfa3f96b/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4337e86ff74cf0d686cb43c621598a54/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4337e86ff74cf0d686cb43c621598a54/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-measurement-impl/16.4.0/98fea79e4a77817f0ce14dd933ef096cd7d79b20/play-services-measurement-impl-16.4.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_16_4_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_16_4_0_aar.xml
index 7568638a5fcfb2b0a804a7283e3d2be7a7f462f0..be3d8c818361cd0fea93fe02691231c005e448da 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_16_4_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_16_4_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-measurement-sdk:16.4.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-measurement-sdk-16.4.0.aar/a40bf172bd26400199984ceb677e72f0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-measurement-sdk-16.4.0.aar/a40bf172bd26400199984ceb677e72f0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d9f33599d7d4ebb0fe3e12b538e5d5e7/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d9f33599d7d4ebb0fe3e12b538e5d5e7/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-measurement-sdk/16.4.0/88561e7c3615c80f0579c3ac4ee9d8ae8bd7df61/play-services-measurement-sdk-16.4.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_api_16_4_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_api_16_4_0_aar.xml
index 578d5cc45a45672a264a9ddf600913d74fa35033..10773c4ccb643e4372cdebf30a836705fa9b4b4b 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_api_16_4_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_api_16_4_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-measurement-sdk-api:16.4.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-measurement-sdk-api-16.4.0.aar/d3f6e4cd0c278315860e5274f442916c/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-measurement-sdk-api-16.4.0.aar/d3f6e4cd0c278315860e5274f442916c/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b93df7392698a26f7bddaba9d6f00757/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b93df7392698a26f7bddaba9d6f00757/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-measurement-sdk-api/16.4.0/b0889362b29c0c1a24c5af14e126d069e86c2644/play-services-measurement-sdk-api-16.4.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_16_0_1_aar.xml
index c5a544bdf6c8787b4054fa42a5f94940d2dc180a..bb2ba4f84c7a54357a87aa316236869ad978e931 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_16_0_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-stats:16.0.1@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-stats-16.0.1.aar/16676006c135e4a69be2f05bb6ffe6c5/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-stats-16.0.1.aar/16676006c135e4a69be2f05bb6ffe6c5/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c29a073502717ce457d5f4c984ff8875/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c29a073502717ce457d5f4c984ff8875/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_16_0_1_aar.xml
index 992b6dad4afe5216996aa7534686d321ccfcda30..3c669467e5e1aeb80a8f78cb021562957d4de1eb 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_16_0_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-tasks:16.0.1@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-tasks-16.0.1.aar/297abbcb5f5842083afc4f9d9a0d59ea/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-tasks-16.0.1.aar/297abbcb5f5842083afc4f9d9a0d59ea/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5a258e940d626329f792cf0c3a4daa0f/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5a258e940d626329f792cf0c3a4daa0f/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_4_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_4_0_aar.xml
index f6bea4529a13b6f7faf5f3907e7d7b6e68d69c0e..e24e2ec1639c8cebd7019b5f1dc588bcf88ea961 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_4_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_4_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-analytics:16.4.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-analytics-16.4.0.aar/e01f1708ef2e57e40a258313b2d94445/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-analytics-16.4.0.aar/e01f1708ef2e57e40a258313b2d94445/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/be723dc7cf6e4a96e9508aa9997c8f0c/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/be723dc7cf6e4a96e9508aa9997c8f0c/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-analytics/16.4.0/b884044d2f8732260837f470f4ed231a876cb2e3/firebase-analytics-16.4.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_auth_16_2_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_auth_16_2_1_aar.xml
index 1ba3c05fe0a59996e4b24a5ccfdd2aee3411f855..676397cda559c241d9e2d5c600a1cf7b9d67836f 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_auth_16_2_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_auth_16_2_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-auth:16.2.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-auth-16.2.1.aar/17cb6c6559d0b2ce5d4e7d4f4acf8aa2/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-auth-16.2.1.aar/17cb6c6559d0b2ce5d4e7d4f4acf8aa2/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/960862eebbcffe412034132ea5108a2d/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/960862eebbcffe412034132ea5108a2d/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-auth/16.2.1/8bbeffaefcb0edbf09b108d2a63ce8e2d1508f3a/firebase-auth-16.2.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_auth_interop_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_auth_interop_16_0_1_aar.xml
index 698ffdb7771a51ec427426ce679ca884c14b307f..65e40550c174def3f411a24ed768552658cba9b4 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_auth_interop_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_auth_interop_16_0_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-auth-interop:16.0.1@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-auth-interop-16.0.1.aar/8dd8774aad7ecf14019d32b02254004a/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-auth-interop-16.0.1.aar/8dd8774aad7ecf14019d32b02254004a/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/20596d78b2d8a94639c97884f3a41026/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/20596d78b2d8a94639c97884f3a41026/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_1_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_1_0_aar.xml
index 5af4b1c30cc9df6eb9eb2b3dd2dddf91ebe2cec3..ad4f82a013d8d553f2a44c6277e485f9160852af 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_1_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-common:16.1.0@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-common-16.1.0.aar/2a71a37e6e958f44fe92487e2b8e8583/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-common-16.1.0.aar/2a71a37e6e958f44fe92487e2b8e8583/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b5b4ca6f4b15765b2de2cc8d620fdef5/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b5b4ca6f4b15765b2de2cc8d620fdef5/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-common/16.1.0/e6e3a5d7f4d0cf5797dadd5443a6978dc58ae4e5/firebase-common-16.1.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_8_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_8_aar.xml
index 0e430876c3a711b55f8d80356748bbcc4056592e..c4effd4299e942654f1b14ca8905029c01bbd3f9 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_8_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_8_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-core:16.0.8@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-core-16.0.8.aar/734e13fb8d54296c65799844db58db7c/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-core-16.0.8.aar/734e13fb8d54296c65799844db58db7c/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/18911012d24ac84ba2dc95391505ee64/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/18911012d24ac84ba2dc95391505ee64/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-core/16.0.8/d744794686c273d9fe2fdad77ee686c87a47625b/firebase-core-16.0.8-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_database_16_1_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_database_16_1_0_aar.xml
index 5a98237439b73fc9daebd01dee9a53db7ba11f9c..01b83b6ab7af99d32d86b5b82600598b3e727a60 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_database_16_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_database_16_1_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-database:16.1.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-database-16.1.0.aar/299d5d2c7aa68a918a0c30c900d7f065/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-database-16.1.0.aar/299d5d2c7aa68a918a0c30c900d7f065/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d1bff41cd2499e507fe98f6018374fc0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d1bff41cd2499e507fe98f6018374fc0/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-database/16.1.0/e7623d62fd877e924d874fc13b225b748a57e95f/firebase-database-16.1.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_database_collection_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_database_collection_16_0_1_aar.xml
index 0e6f85ee053edfb89799f3d48faa58c1d4fdeafa..b35685b46057832fb57d019f1e443971e0db569b 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_database_collection_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_database_collection_16_0_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-database-collection:16.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-database-collection-16.0.1.aar/73d62f2a9c466789f5a67f873c4d0f28/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-database-collection-16.0.1.aar/73d62f2a9c466789f5a67f873c4d0f28/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7ff7c23ce97f2ef5669b017aba8b2a24/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7ff7c23ce97f2ef5669b017aba8b2a24/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-database-collection/16.0.1/b5886c1473251920abb7253028aafb63b2d5e0a5/firebase-database-collection-16.0.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_3_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_3_aar.xml
index 537a31ca8faf2931f57e39aae345aaea57f262f0..b9f8587908766fe9a8358addbf833c7dea2a3046 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_3_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_3_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-iid:17.0.3@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-iid-17.0.3.aar/2a9fb142c11bce382d6dd7af03d09f07/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-iid-17.0.3.aar/2a9fb142c11bce382d6dd7af03d09f07/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fd8765e7007cf839ed367b255e48752e/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fd8765e7007cf839ed367b255e48752e/res" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-iid/17.0.3/f75ec044e44b868f2a037e753b0287889e224837/firebase-iid-17.0.3-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_1_aar.xml
index 906d44d3215a26506863ffebe03b146e32d0a685..be52063ac88773df991f0fc55813f5b5ac6ab7de 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-iid-interop:16.0.1@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-iid-interop-16.0.1.aar/48843c08cd2db89c07e3b400bcddff55/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-iid-interop-16.0.1.aar/48843c08cd2db89c07e3b400bcddff55/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/952da532928014f66f7a88175825eb8d/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/952da532928014f66f7a88175825eb8d/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_1_aar.xml
index 2f8a088d8fb9cbdda9b3a90429cb9255422ba289..c48b810667f349a49a80a50a33d7e36d8951466c 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-measurement-connector:17.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-measurement-connector-17.0.1.aar/4e389dc0166cafec7e75fb793c30de3b/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-measurement-connector-17.0.1.aar/4e389dc0166cafec7e75fb793c30de3b/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bedbb68b8ef1be3f21af88a7c4219e66/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bedbb68b8ef1be3f21af88a7c4219e66/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 28226e39988a590b253e71596589b79b81acda31..ce497f7a8032afd312d85b16060708e4117d0263 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/unirides.iml" filepath="$PROJECT_DIR$/unirides.iml" />
+      <module fileurl="file://$PROJECT_DIR$/UniRides.iml" filepath="$PROJECT_DIR$/UniRides.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/unirides.iml b/UniRides.iml
similarity index 97%
rename from unirides.iml
rename to UniRides.iml
index f16748234f1e0179a8b0f9498446509c0b7f5da8..1b4c4719c9d68933f60cc634a86bccfa5e55c2ec 100644
--- a/unirides.iml
+++ b/UniRides.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="unirides" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="UniRides" 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="android-gradle" name="Android-Gradle">
       <configuration>
@@ -17,7 +17,8 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/build/generated/res/google-services/debug;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/build/generated/res/google-services/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
@@ -89,12 +90,10 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/external_libs_dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/duplicate_classes_check" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
@@ -105,12 +104,12 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
@@ -119,14 +118,13 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
@@ -153,6 +151,7 @@
     <orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid:17.0.3@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-api:16.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-location:16.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-database-collection:16.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-base:16.4.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
@@ -164,6 +163,7 @@
     <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor:1.0.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-places-placereport:16.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:transition:28.0.0@aar" level="project" />
diff --git a/build.gradle b/build.gradle
index cec88ade1c35bf32c7f17e4a8745f5cd03445b9e..e0e25a0f7bfe9d3008a7972690ddfe56337cdb27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         classpath 'com.google.gms:google-services:4.0.1'
     }
 }
@@ -42,6 +42,7 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.google.android.gms:play-services-maps:16.1.0'
+    implementation 'com.google.android.gms:play-services-location:16.0.0'
     implementation 'com.google.firebase:firebase-core:16.0.8'
     implementation 'com.google.firebase:firebase-auth:16.2.1'
     implementation 'com.google.firebase:firebase-database:16.1.0'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5de4839f38cfefb7ccea31358c5ccdb65f2b1694..272e2d6368f615a7216879a202152a6fab46ceab 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 19:36:21 BST 2019
+#Fri Apr 19 19:30:13 BST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/local.properties b/local.properties
index 64fc61fa9137b9c689cd85e40ee349942a50925a..23fa81dd0f135648b1b2f651f13aeca4764b5850 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Sun Apr 14 02:11:11 BST 2019
-sdk.dir=C\:\\Users\\Ronan\\AppData\\Local\\Android\\Sdk
+#Fri Apr 19 19:30:09 BST 2019
+sdk.dir=C\:\\Users\\m_wu\\AppData\\Local\\Android\\Sdk
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 93a4602a868ccc45943cd7f1c47b59aac96e66f2..922e33407ae20a346ab34f63ce2770ac71fe8e17 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -6,7 +6,10 @@
          Google Maps Android API v2, but you must specify either coarse or fine
          location permissions for the 'MyLocation' functionality.
     -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- To auto-complete the email text field in the login form with the user's emails -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
diff --git a/src/main/java/com/example/liliyayankova/unirides/Map.java b/src/main/java/com/example/liliyayankova/unirides/Map.java
index caaab231e92a71ac796d356be0ca4972a93395f4..e5c4c1b3835f4ccdba4340ac06f0702020dab9f3 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Map.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Map.java
@@ -1,54 +1,169 @@
 package com.example.liliyayankova.unirides;
 
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
+import android.Manifest;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.location.Location;
+import android.location.LocationManager;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.FragmentActivity;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.View;
+import android.support.v4.content.ContextCompat;
+import android.widget.Toast;
 
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.location.LocationRequest;
+import com.google.android.gms.location.LocationListener;
+import com.google.android.gms.location.LocationServices;
+import com.google.android.gms.maps.CameraUpdate;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
 
-public class Map extends FragmentActivity implements OnMapReadyCallback {
+public class Map extends FragmentActivity implements
+        OnMapReadyCallback,
+        GoogleApiClient.ConnectionCallbacks,
+        GoogleApiClient.OnConnectionFailedListener,
+        LocationListener {
 
+    LocationManager locationManager;
     private GoogleMap mMap;
+    private GoogleApiClient mGoogleApiClient;
+    private LocationRequest mLocationRequest;
+    private Location currentLocation;
+    private Marker myLocation;
+    private static final int REQUEST_USER_LOCATION_CODE = 99;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_map);
-
-        // Obtain the SupportMapFragment and get notified when the icon_map is ready to be used.
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){
+            checkUserLocationPermission();
+        }
+        // Obtain the SupportMapFragment and get notified when the map is ready to be used.
         SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
                 .findFragmentById(R.id.map);
         mapFragment.getMapAsync(this);
 
+        locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
 
     }
 
-
-    /**
-     * Manipulates the icon_map once available.
-     * This callback is triggered when the icon_map is ready to be used.
-     * This is where we can add markers or lines, add listeners or move the icon_camera. In this case,
-     * we just add a marker near Sydney, Australia.
-     * If Google Play services is not installed on the device, the user will be prompted to install
-     * it inside the SupportMapFragment. This method will only be triggered once the user has
-     * installed Google Play services and returned to the app.
-     */
     @Override
     public void onMapReady(GoogleMap googleMap) {
         mMap = googleMap;
+        if(ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
+                == PackageManager.PERMISSION_GRANTED) {
+
+            buildGoogleApiClient();
+
+            mMap.setMyLocationEnabled(true);
+        }
+    }
+
+    public boolean checkUserLocationPermission(){
+        if(ContextCompat.checkSelfPermission(this,
+                Manifest.permission.ACCESS_FINE_LOCATION)
+                != PackageManager.PERMISSION_GRANTED){
+            if(ActivityCompat.shouldShowRequestPermissionRationale(this,
+                    Manifest.permission.ACCESS_FINE_LOCATION)){
+                ActivityCompat.requestPermissions(this, new String[]
+                        {Manifest.permission.ACCESS_FINE_LOCATION}, REQUEST_USER_LOCATION_CODE);
+            }else{
+                ActivityCompat.requestPermissions(this, new String[]
+                        {Manifest.permission.ACCESS_FINE_LOCATION}, REQUEST_USER_LOCATION_CODE);
+            }
+            return false;
+        }else{
+            return true;
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
+        switch (requestCode){
+            case REQUEST_USER_LOCATION_CODE:
+                if(grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    if (ContextCompat.checkSelfPermission(this,
+                            Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+                        if (mGoogleApiClient == null) {
+                            buildGoogleApiClient();
+                        }
+                        mMap.setMyLocationEnabled(true);
+                    }
+                }else{
+                    Toast.makeText(this, "Permission Denied.", Toast.LENGTH_SHORT).show();
+                }
+                return;
+        }
+    }
+
+    protected synchronized void buildGoogleApiClient(){
+        mGoogleApiClient = new GoogleApiClient.Builder(this)
+                .addConnectionCallbacks(this)
+                .addOnConnectionFailedListener(this)
+                .addApi(LocationServices.API)
+                .build();
+
+        mGoogleApiClient.connect();
+    }
+
+    @Override
+    public void onLocationChanged(Location location) {
+        currentLocation = location;
+        if(myLocation != null){
+            myLocation.remove();
+        }
+
+        LatLng latLng = new LatLng(location.getLatitude(), location.getLongitude());
+        MarkerOptions markerOptions = new MarkerOptions();
+        markerOptions.position(latLng);
+        markerOptions.title("This be you.");
+        markerOptions.icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_CYAN));
+        myLocation = mMap.addMarker(markerOptions);
+
+        mMap.moveCamera(CameraUpdateFactory.newLatLng(latLng));
+        mMap.animateCamera(CameraUpdateFactory.zoomBy(10));
+
+        if(mGoogleApiClient != null){
+            LocationServices.FusedLocationApi.removeLocationUpdates(mGoogleApiClient, this);
+
+        }
+    }
+
+    @Override
+    public void onConnected(@Nullable Bundle bundle) {
+        mLocationRequest = new LocationRequest();
+        mLocationRequest.setInterval(1000);
+        mLocationRequest.setFastestInterval(1000);
+        mLocationRequest.setPriority(LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY);
+
+        if(ContextCompat.checkSelfPermission(this,
+                Manifest.permission.ACCESS_FINE_LOCATION)
+                == PackageManager.PERMISSION_GRANTED) {
+            LocationServices.FusedLocationApi.requestLocationUpdates(mGoogleApiClient,
+                    mLocationRequest, this);
+        }
+    }
+
+    @Override
+    public void onConnectionSuspended(int i) {
+
+    }
+
+    @Override
+    public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
 
-        // Add a marker in Sydney and move the icon_camera
-        LatLng sydney = new LatLng(-34, 151);
-        mMap.addMarker(new MarkerOptions().position(sydney).title("Marker in Sydney"));
-        mMap.moveCamera(CameraUpdateFactory.newLatLng(sydney));
     }
 }