diff --git a/.gradle/5.1.1/executionHistory/executionHistory.bin b/.gradle/5.1.1/executionHistory/executionHistory.bin
new file mode 100644
index 0000000000000000000000000000000000000000..90ab1441701810b0162915fdbc057d98ab90cd4f
Binary files /dev/null and b/.gradle/5.1.1/executionHistory/executionHistory.bin differ
diff --git a/.gradle/5.1.1/executionHistory/executionHistory.lock b/.gradle/5.1.1/executionHistory/executionHistory.lock
new file mode 100644
index 0000000000000000000000000000000000000000..a97179347219f6d1df95eff75b5f7ff2c491f71b
Binary files /dev/null and b/.gradle/5.1.1/executionHistory/executionHistory.lock differ
diff --git a/.gradle/5.1.1/fileChanges/last-build.bin b/.gradle/5.1.1/fileChanges/last-build.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d
Binary files /dev/null and b/.gradle/5.1.1/fileChanges/last-build.bin differ
diff --git a/.gradle/5.1.1/fileContent/fileContent.lock b/.gradle/5.1.1/fileContent/fileContent.lock
new file mode 100644
index 0000000000000000000000000000000000000000..0226ef693eec5d64e4b3f7d3e76f5cbd597533a3
Binary files /dev/null and b/.gradle/5.1.1/fileContent/fileContent.lock differ
diff --git a/.gradle/5.1.1/fileHashes/fileHashes.bin b/.gradle/5.1.1/fileHashes/fileHashes.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9541604d830ddf720fadb80b1ecc7f4d2c98241b
Binary files /dev/null and b/.gradle/5.1.1/fileHashes/fileHashes.bin differ
diff --git a/.gradle/5.1.1/fileHashes/fileHashes.lock b/.gradle/5.1.1/fileHashes/fileHashes.lock
new file mode 100644
index 0000000000000000000000000000000000000000..911ab0ffc2bf26d715e797786a69f17bcb368393
Binary files /dev/null and b/.gradle/5.1.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/5.1.1/fileHashes/resourceHashesCache.bin b/.gradle/5.1.1/fileHashes/resourceHashesCache.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7fab46a35b38bfe377714770e7fc10d2fbeae0e2
Binary files /dev/null and b/.gradle/5.1.1/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/5.1.1/gc.properties b/.gradle/5.1.1/gc.properties
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/.gradle/5.1.1/javaCompile/classAnalysis.bin b/.gradle/5.1.1/javaCompile/classAnalysis.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c36234f1ae382f62999f7977ceb073f0d8a5f4d1
Binary files /dev/null and b/.gradle/5.1.1/javaCompile/classAnalysis.bin differ
diff --git a/.gradle/5.1.1/javaCompile/javaCompile.lock b/.gradle/5.1.1/javaCompile/javaCompile.lock
new file mode 100644
index 0000000000000000000000000000000000000000..42b9b98b470b89beb7ed98025292b9dcaa9020ef
Binary files /dev/null and b/.gradle/5.1.1/javaCompile/javaCompile.lock differ
diff --git a/.gradle/5.1.1/javaCompile/taskHistory.bin b/.gradle/5.1.1/javaCompile/taskHistory.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f1e2b533c3c48dd006a2d54eaa96a506c1c9673c
Binary files /dev/null and b/.gradle/5.1.1/javaCompile/taskHistory.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index dc585bc444e23c491a2a586f83d5969c1873ecba..a28cfe42f4588ac3e61f6401440a111c8de9f854 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 4966d303ba5262255ee0f788fe86554b15241141..1cfc479c24d0006024d348f802f49262c88780d9 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 a55f70b58e33e580bdc871a0ef8a9ae12f1f1c48..ec678b117b28eaaec7bac899c432ffb682ef134d 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 3517d71c7fceb2631048f77edfb40aba75e43efe..1b3919cc3cea16bd2677f4ef0956bc71f041a8cd 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..15a15b218a29e09c9190992732698d646e4d659a
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2996d531255e06fae876df257e8237225a4906b7..47bd81ff324e223261acf802991656d9876f7d31 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,11 +3,13 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
         <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
diff --git a/.idea/libraries/Gradle__android_arch_core_common_1_0_0_jar.xml b/.idea/libraries/Gradle__android_arch_core_common_1_0_0_jar.xml
deleted file mode 100644
index 0647ff180acfb95f443d65183bbc9e7ea45429ca..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__android_arch_core_common_1_0_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.core:common:1.0.0@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.0.0/a2d487452376193fc8c103dd2b9bd5f2b1b44563/common-1.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.0.0/a41fa3b9a66f3bdd41f98013a1688e969072aaf2/common-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</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 a49b56c1933b962489a3edbf1da8ffaeb16c5fe5..a26d333d9319c59db6312efada2e31018c48d858 100644
--- a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: android.arch.core:runtime:1.1.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7217d8a7df2385d88b1f1972965cc33/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7217d8a7df2385d88b1f1972965cc33/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f1ddab27c57a116ccd67f397b1d0cbb3/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f1ddab27c57a116ccd67f397b1d0cbb3/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_0_0_jar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_common_1_0_0_jar.xml
deleted file mode 100644
index 7d25f6bf421b9fee1395695c9523c010ce602706..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_0_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.lifecycle:common:1.0.0@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.0.0/e414a4cb28434e25c4f6aa71426eb20cf4874ae9/common-1.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.0.0/39ce4055689b4b766478265a8c661f4165f26dc3/common-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
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 02127af9c14277ca47e02d44593c0bb4c8deb476..e593d930a8de964c91a4331ae87dbd14d94c7921 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec05876a33821c3a47b4f2c5f12f4a7e/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec05876a33821c3a47b4f2c5f12f4a7e/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7aed3e4b6b51da3ba4e1a6583590d815/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7aed3e4b6b51da3ba4e1a6583590d815/jars/classes.jar!/" />
     </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 1b3aa43c975b8b55dfd113e154c6d4af5b62d965..666a5d2de9b6141899a585b94ff172eb38f57ac8 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="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!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2edd907cb4b02bdc1e1b3fcd1336d10c/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2edd907cb4b02bdc1e1b3fcd1336d10c/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_0_0_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_0_0_aar.xml
deleted file mode 100644
index 3c883a07c9ddbb79b15b7868efae02d5612643a5..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.lifecycle:runtime:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/0ccb4629faf86f4c01407612129e404b/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/0ccb4629faf86f4c01407612129e404b/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/runtime/1.0.0/1dd0298d8c45d8dfa4d038270247327f23df7a3a/runtime-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
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 03c8d9c91598c72c69e26ec885fb1ec2771054c5..bbab9329bd8b3c3d65b445d8fd68d2745bf37101 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="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!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1638308ae1b7b952095c1ae09bf3bf10/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1638308ae1b7b952095c1ae09bf3bf10/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
index 33b5f7a4fae2990615103ae6d97827e2312437bf..20abdd965c34eb3e599c4eb8b45710c99cdb98e9 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b1672fb793b30bd63e2a36eaea28ee57/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b1672fb793b30bd63e2a36eaea28ee57/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e7cdd667d9edc3c7722b88c42064610b/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e7cdd667d9edc3c7722b88c42064610b/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_24_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_24_0_0_aar.xml
deleted file mode 100644
index 3806244517145d23058cd40f3f83a4030b23fdbd..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_24_0_0_aar.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:animated-vector-drawable:24.0.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-24.0.0.aar/cc99b7f3b71c9319d62aa91778f014ec/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-24.0.0.aar/cc99b7f3b71c9319d62aa91778f014ec/res" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/animated-vector-drawable/24.0.0/animated-vector-drawable-24.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/animated-vector-drawable/24.0.0/animated-vector-drawable-24.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
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 46a10db68bac652d658efecca189aca9c898bce4..ce6e1584b7c9829d6b5b8f3839b7fb5d63401bb8 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="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!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c61ea99d8f012ff840857f410830b507/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c61ea99d8f012ff840857f410830b507/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_24_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_24_0_0_aar.xml
deleted file mode 100644
index 1facffc6db7498538652c670895aae04218f833f..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__com_android_support_appcompat_v7_24_0_0_aar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:appcompat-v7:24.0.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-24.0.0.aar/beee857e9d5a4385744d7434172b96de/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-24.0.0.aar/beee857e9d5a4385744d7434172b96de/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-24.0.0.aar/beee857e9d5a4385744d7434172b96de/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/appcompat-v7/24.0.0/appcompat-v7-24.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/appcompat-v7/24.0.0/appcompat-v7-24.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
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 94f0c579e094481bfa25fcb979a3d628225ec438..18dfe9cc4fe9ed0744d081dbdccd63fcc020e213 100644
--- a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:appcompat-v7:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6f43171b0e4a2a148faffa75382b8561/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3130850cf28d7ef9f18dfa871489eb27/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <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!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3130850cf28d7ef9f18dfa871489eb27/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3130850cf28d7ef9f18dfa871489eb27/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
index 2b8d6fa9e08279dcef0bd8615a74ae802e93df58..9fb6e944fa60ec8f849c9bc8bb4e98b29b77e24b 100644
--- a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ae46894ec2683176e675c2580d2a2dcc/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ae46894ec2683176e675c2580d2a2dcc/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eaaea6236999500633d2a24a2823e6e8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eaaea6236999500633d2a24a2823e6e8/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 60b8e110c6f6b8dd4142e292593679565a221e13..fd0496dcb8dab709e48b8a39859cd33f603c0fa6 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="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!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e04a97ff00d28f77d05dfe58715e5d18/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e04a97ff00d28f77d05dfe58715e5d18/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 236475046730dd7f512dc47fa1634fdd634bdc3b..fba8a3992a0b1f48a4bd75905f7bb7162274bc29 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="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!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/811bcc1c7426cdc327bb39a75e05eb73/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/811bcc1c7426cdc327bb39a75e05eb73/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
index 6f3352fa09e028c3b2434cdc41369572da0c6f58..4b91dc37d4c112746ca079e8d726507a93a51b66 100644
--- a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f1b583b97153a1d13d69b281e668eeaf/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/43c60b53a800ff5e086998cb5419e5a7/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <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!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/43c60b53a800ff5e086998cb5419e5a7/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/43c60b53a800ff5e086998cb5419e5a7/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 de4d98f464932d7605486a74c59e99b72e191c14..e1ade3047f5faa5d59aef239f76e033d8446ab74 100644
--- a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:cursoradapter:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/774e653c7076b9e80d4e673ba6d75934/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/774e653c7076b9e80d4e673ba6d75934/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c43ccea522d81501f7b1db5dc342e39f/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c43ccea522d81501f7b1db5dc342e39f/jars/classes.jar!/" />
     </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 554311c7ec6b5e06e4fa3c7b0484c4bd0b143cfe..522130d07f68cff5bb6fa203520e19438a92a4d3 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-2/files-2.1/0716fd665728f35d644ce6801c4321be/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0716fd665728f35d644ce6801c4321be/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e9b0bbd41e5e73d108c616e2237f42e0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e9b0bbd41e5e73d108c616e2237f42e0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_design_24_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_design_24_0_0_aar.xml
deleted file mode 100644
index ced36b75e67be1f2e8d3c35af17482d6e154bd30..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__com_android_support_design_24_0_0_aar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:design:24.0.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-24.0.0.aar/33e63d0f651182cea09923614a48b692/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-24.0.0.aar/33e63d0f651182cea09923614a48b692/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-24.0.0.aar/33e63d0f651182cea09923614a48b692/res" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/design/24.0.0/design-24.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/design/24.0.0/design-24.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
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 2d256f21f13332797c5321a47a062fd4a643aaab..4b9528bafb31bce99f177e97d4afcbf289a18700 100644
--- a/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:design:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5740e154ce5fe1db59c846b257d27be2/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7ec8c50647f66cd4b0b79800196df1c8/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <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" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7ec8c50647f66cd4b0b79800196df1c8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7ec8c50647f66cd4b0b79800196df1c8/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 70f253c0142bb3988d8ee08cbefa3c0ed78d64cf..0fd27651962f9a509a65f8e09dd85735b233371e 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="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!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/792506c3a81b5c0d545da77055930ed3/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/792506c3a81b5c0d545da77055930ed3/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
index f5db4ed9220f8fc21db0c207046716095d46f088..dd782639d9a22a1516e88a6661862241f14c7dda 100644
--- a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:drawerlayout:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c270cdabc9c8d5e31e04f70d502c1a6/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1060649a970b090f41a1ffc452b7a760/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <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" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1060649a970b090f41a1ffc452b7a760/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1060649a970b090f41a1ffc452b7a760/jars/classes.jar!/" />
     </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 32707cb011622190befaf015f0d19b3c668e088c..10dede2368c2913434101ab5fad18e2b4afa913e 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="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!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bd6fd2664373fb8537729aa265fa11c4/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bd6fd2664373fb8537729aa265fa11c4/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
index 38e76c5d06eaa2a810be719b5dbc0630aefc765d..163f2f7283fa286bcb8cae6900b20f91845d74bf 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-2/files-2.1/13206e5f047b63943fd8f752a000ee37/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/13206e5f047b63943fd8f752a000ee37/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/569da9078a77e13932e6056678d1464d/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/569da9078a77e13932e6056678d1464d/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 b8f5ef68b88ff2406ecf2a79e27565811d7033e8..2522ba7f0073f2c12174d9b15e52df46c6d5be6e 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-2/files-2.1/4fa002bc16854aa2990e3269befbab17/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fa002bc16854aa2990e3269befbab17/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/37e7db454c64300ce74930ef92870548/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/37e7db454c64300ce74930ef92870548/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
index b5535877e6536ce91a0869b499d5643c7363e5cd..5e2993ee46983dba6b3c14c033daaf71b20a322f 100644
--- a/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:print:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/14c6b0493e7b32c2a048840435bc0f7b/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b1cfd33c244e7c5f1258f37fe5c19f1a/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <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" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b1cfd33c244e7c5f1258f37fe5c19f1a/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b1cfd33c244e7c5f1258f37fe5c19f1a/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_24_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_24_0_0_aar.xml
deleted file mode 100644
index 6bef6435845143c4c39db7214cdcb90ae5d9a20e..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_24_0_0_aar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:recyclerview-v7:24.0.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-24.0.0.aar/783734d88ea85b0dc0e5c5a1735dc9ae/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-24.0.0.aar/783734d88ea85b0dc0e5c5a1735dc9ae/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-24.0.0.aar/783734d88ea85b0dc0e5c5a1735dc9ae/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/recyclerview-v7/24.0.0/recyclerview-v7-24.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/recyclerview-v7/24.0.0/recyclerview-v7-24.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
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 ebf93d92d76ba4cc2d8ea56b9ea9320c611ae68c..f723dc4048a6fa9ce10310e7aae3acc7e3e6a5ed 100644
--- a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2f381d6bebe5090a25f5e8535b82a456/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6a5d153332a925eb6daa5f1f5b7adba9/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <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" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6a5d153332a925eb6daa5f1f5b7adba9/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6a5d153332a925eb6daa5f1f5b7adba9/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 86ff241f7bb02318b33522758808c02fc8060ae3..01023406491ec996a4b24841c3dbb08736677f6b 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="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!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2206e972fccf147045366113cfab7eb1/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2206e972fccf147045366113cfab7eb1/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_26_1_0_jar.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_26_1_0_jar.xml
deleted file mode 100644
index 33711518308ee072eb4d0772e8c75b148adbb73a..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__com_android_support_support_annotations_26_1_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-annotations:26.1.0@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/26.1.0/814258103cf26a15fcc26ecce35f5b7d24b73f8/support-annotations-26.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/26.1.0/29ca6aaf2d4976c13dd7c836e91bd2a61b697bf3/support-annotations-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_27_1_1_jar.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_27_1_1_jar.xml
deleted file mode 100644
index 1517ad9ca10a6f3333fb9b1419208f9ff538118a..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__com_android_support_support_annotations_27_1_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-annotations:27.1.1@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/27.1.1/39ded76b5e1ce1c5b2688e1d25cdc20ecee32007/support-annotations-27.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/27.1.1/46bebf5bd40146178cb33c7678f3782a09dea6e4/support-annotations-27.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_26_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_compat_26_1_0_aar.xml
deleted file mode 100644
index 59e1b325c44e1d8a41fcb9849b51be6d3ab0f3a2..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__com_android_support_support_compat_26_1_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-compat:26.1.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/05c79d3e0617280687d74578296e4cc1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/05c79d3e0617280687d74578296e4cc1/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-compat/26.1.0/73bfdb5cca1949a51219d3676700996990ea3b52/support-compat-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
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 c85a6f0e8f7fddf32de275d71da932a3af909d11..c962a4a47c1ca240aaa5664d5bdd06a46d762b44 100644
--- a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-compat:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/491e55b5cb53f8e1150b3e4a9f7afb18/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/edc2e73e68502b20c48a430c436619cf/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <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" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/edc2e73e68502b20c48a430c436619cf/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/edc2e73e68502b20c48a430c436619cf/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_26_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_26_1_0_aar.xml
deleted file mode 100644
index 92ec07ce06f6b59faf598c3970abb49d9343569c..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__com_android_support_support_core_ui_26_1_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-core-ui:26.1.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/78dc22b9a713a1403367a9a810b5d5bc/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/78dc22b9a713a1403367a9a810b5d5bc/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-core-ui/26.1.0/4d52cef4a24bf9939de1d256ca9f0974c6e636a4/support-core-ui-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
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 449c7eda54a52be9a3c355ae9701c9193ef20824..d1f67d227a93225da995e1b114cef13a2f2f24fa 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="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!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7e9d651f343ec427b4eee4f699be4b6/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7e9d651f343ec427b4eee4f699be4b6/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_26_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_26_1_0_aar.xml
deleted file mode 100644
index 602db35bf8c4721a41721173aa9e1874beb217e8..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__com_android_support_support_core_utils_26_1_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-core-utils:26.1.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/ea17020ccabee75e68fd3d933d884d43/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/ea17020ccabee75e68fd3d933d884d43/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-core-utils/26.1.0/2b0c3da7f80880bbf365452b354490a77f085c96/support-core-utils-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
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 29ce523049b0bcabb99f1e19c658b4a7e8dbeaaa..5f6e61c96d210233b828bb30612e28d10610715c 100644
--- a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-core-utils:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/172a39e505c0043ada6580f16087e1be/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/172a39e505c0043ada6580f16087e1be/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/335e28948a0724c82a99dc690d752303/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/335e28948a0724c82a99dc690d752303/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_26_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_26_1_0_aar.xml
deleted file mode 100644
index 57e4af623366c1169073a678edcf75f1c41806a3..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__com_android_support_support_fragment_26_1_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-fragment:26.1.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/130a73c82ebc3498aaab4c3f855147f1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/130a73c82ebc3498aaab4c3f855147f1/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-fragment/26.1.0/8279b00f5194701ff18363fa2958c5a26670b0ef/support-fragment-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
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 aaa8759f57ad9cdbee8b8e571663b5a115784c9b..959c5d6abb37dcadac26ff7ed07208e97157d544 100644
--- a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-fragment:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cd859756b99521dfb204a563ee458385/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/41b1c1de26ff8b63a410082f430bd0ae/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <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!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/41b1c1de26ff8b63a410082f430bd0ae/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/41b1c1de26ff8b63a410082f430bd0ae/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0_aar.xml
deleted file mode 100644
index 925a6978d8248437fe54bbd7eee2282b54aa596c..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-media-compat:26.1.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/d2c65e819ae53e7992d4cf737a933b45/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/d2c65e819ae53e7992d4cf737a933b45/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-media-compat/26.1.0/774fd1164ec32514eec562953f723a1920a7fef7/support-media-compat-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
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 1fc0fc47c34dfa7b9442bdb7e73fa7b51e7cffbf..f8863c1b3981ac55bb5648fd224e5fad5e937759 100644
--- a/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-media-compat:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d7a65d4039958b7f5739cf73b1a2872/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dd8a7f010ada3a841bc30bf9cf665c04/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <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!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dd8a7f010ada3a841bc30bf9cf665c04/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dd8a7f010ada3a841bc30bf9cf665c04/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0_aar.xml
deleted file mode 100644
index 529b110228c0913b42ebeabfeb4e9ac5aa22b03d..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-v4:26.1.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/6eb9a3a30912c95936534c1f0dc20ca6/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/6eb9a3a30912c95936534c1f0dc20ca6/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-v4/26.1.0/9c53eab3272b3b26583b17facac2e90d264b2788/support-v4-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
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 d49d92fdffa595ccf2bdb27968554466813a4017..9eeb2a5bc550d9b63030161416c6f73f12fa2801 100644
--- a/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-v4:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/deb8728fd354da615083f30e62568af9/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/deb8728fd354da615083f30e62568af9/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/82c850389c5b901c14f5723531a55e5b/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/82c850389c5b901c14f5723531a55e5b/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_24_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_24_0_0_aar.xml
deleted file mode 100644
index 2ee7141e7d403334a382a4a923813bebda5fc081..0000000000000000000000000000000000000000
--- a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_24_0_0_aar.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-vector-drawable:24.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-24.0.0.aar/cae6fad070f938211f10538218246ddc/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-24.0.0.aar/cae6fad070f938211f10538218246ddc/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/support-vector-drawable/24.0.0/support-vector-drawable-24.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/support-vector-drawable/24.0.0/support-vector-drawable-24.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
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 0fb8f9daaf2a07339c716269d7556281eb6947db..502c6ec3086a2ea09c33b780e00b7ec9ba182e20 100644
--- a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fe1222057e110bd5ecac64f3524f1d67/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fe1222057e110bd5ecac64f3524f1d67/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6213bbad4d9c9dad1bbec66fc95d62fe/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6213bbad4d9c9dad1bbec66fc95d62fe/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 b5e220dd56fa50ea3c8eca135cf2243745510533..412b78a8ee71012c12267a87c88c1f9016fa27c4 100644
--- a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f6e1636ffa35beca9a5cbd58f633d442/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b79081fd0b77bb0dbb114fc9e6760219/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <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" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b79081fd0b77bb0dbb114fc9e6760219/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b79081fd0b77bb0dbb114fc9e6760219/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 8c847a548660ae821129eaffd1894cae33ec95f1..4a40f206a5e6fb5e78bb7bf31c463a3384da90ed 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c23c277029c755c33e49f20a5ed7b063/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c23c277029c755c33e49f20a5ed7b063/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/576971d67ac0a462319e6e550bbc7b91/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/576971d67ac0a462319e6e550bbc7b91/jars/classes.jar!/" />
     </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 c328e21a22567ca9a49205da302fb471aab93f71..4724615d1197bf6192354dd0409b0bc7b2f884ae 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/09b4b6b7f3d781fdf7ba93327adf1fd6/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/09b4b6b7f3d781fdf7ba93327adf1fd6/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/207aa2aeb2dccf412f1b582565bb8546/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/207aa2aeb2dccf412f1b582565bb8546/jars/classes.jar!/" />
     </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 bccc6fb0ce2ea2fd47bfd6180a1927d5f26a353d..4b99e6c619b178537c8f2224fff3246ac084f1f8 100644
--- a/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test:monitor:1.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bfb196c061562a4c85a5941d75dfa2f8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bfb196c061562a4c85a5941d75dfa2f8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3b32b873677760a961de10124979d034/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3b32b873677760a961de10124979d034/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 2b6a9a0fd146f476d59761165890d3b1ea57e99f..96551266d1217a309be7783ba64f90ae561aaa0f 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-2/files-2.1/71d3d4f5cd9058f56ad65968850312cb/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/71d3d4f5cd9058f56ad65968850312cb/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/edab8227e2a32eca6df7d0fdf275c1f9/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/edab8227e2a32eca6df7d0fdf275c1f9/res" />
     </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 b7fc485cabda68b86bc13e7b2a9a38faf59d0aba..25c772911bffb4ef6b0c32523231c278d1cf4961 100644
--- a/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:transition:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c3f32d85a9669233bd8fc137b1a5c8ee/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2317561b61aed41fdf6657e89c4929f2/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <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" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2317561b61aed41fdf6657e89c4929f2/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2317561b61aed41fdf6657e89c4929f2/jars/classes.jar!/" />
     </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 7e1017a89ed68727556bf8e420e8f944f5b6a346..7f16be7281c11b56c3f389ea0684055bf452da40 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="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!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5a83b1431a469844d2a7cf14ad6994dd/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5a83b1431a469844d2a7cf14ad6994dd/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 3e08ac7675d7a28bd938a12222567c187d5072ee..2a4756d1ce8f6cd26a30867b948fc00306c98b8e 100644
--- a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:viewpager:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ee405f3565100ab6e2720621924b174/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ee405f3565100ab6e2720621924b174/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4d5094019d9dd47babd8bc940c57af37/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4d5094019d9dd47babd8bc940c57af37/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 fcbd1b37d5438965960b678452eb9601b8e4a7e4..07d6ae2e11f213c951a5c5c27a0972ef241df8d1 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-2/files-2.1/7b59aeee1a47e5e18e722112ae4be749/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7b59aeee1a47e5e18e722112ae4be749/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/31bfc4f7eec15155bd06cb544d316c19/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/31bfc4f7eec15155bd06cb544d316c19/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 281d8457aa30ffb40f3d55c06ebdd72c0ad6755b..85e4f2459f1ad8b96a959992174b206a18d93c31 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="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!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/aff18a80f59f46f223f8cd8352488f69/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/aff18a80f59f46f223f8cd8352488f69/res" />
     </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 0411787d4721acee9627603bb20449c4dc4296b9..eadc434511f1a977a619c0d0768dd9c598577953 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-2/files-2.1/395b13f46faa04b229cd9f50343aa837/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/395b13f46faa04b229cd9f50343aa837/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8dc35d56addedabee372c48b93f50b5c/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8dc35d56addedabee372c48b93f50b5c/jars/classes.jar!/" />
     </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 1b5ac01f14c5826efe2416251a0a31f43de5bfbb..75704153eea588a1ee1867806c05c4ba7f3fb045 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-2/files-2.1/d5b69c651a72c17744b998825d436022/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d5b69c651a72c17744b998825d436022/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e96876a095a350434bdd42ffd8629e2d/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e96876a095a350434bdd42ffd8629e2d/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_location_16_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_location_16_0_0_aar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..30f228ab91e963f4ec2116d7efc375e1fc610bfc
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_location_16_0_0_aar.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="Gradle: com.google.android.gms:play-services-location:16.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/71d2c02279f04e623c682e5948efb4cf/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/71d2c02279f04e623c682e5948efb4cf/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
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 f19f9103d849d6be204966352680bb28add7b5c2..3b5f3d301ad7bd1d6075bd4404ab8a06ba541fd4 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-2/files-2.1/781ea4ad1da28c0e6c7cb578017efe45/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/781ea4ad1da28c0e6c7cb578017efe45/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5c3d4a4bb43d218ea8979263a5cb2f80/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5c3d4a4bb43d218ea8979263a5cb2f80/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 bf6084261670518413995b09fcc3c614d390bcce..57a0d392f2fc68f0d5cea979ac3a5f574a155f1c 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="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!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/61c282e29f80d22e7c8e6e2bae65c5a5/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/61c282e29f80d22e7c8e6e2bae65c5a5/res" />
     </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 bf62cef1546f2257a2ce96f7864fa1b081c8adc1..3408d8811f5612dacc2df80b49801c3a0267580a 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-2/files-2.1/d54729030a57dc51ec43900fbcdbf94d/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d54729030a57dc51ec43900fbcdbf94d/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f59927a1ad6c3a75ccba740d1daf9a5/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f59927a1ad6c3a75ccba740d1daf9a5/res" />
     </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 d7b0b4cbab3cb9186fb20cbf9338f5d1ea67aa06..fef1ae6a2b05a24d7a1381eb5269471bf7e19e37 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="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!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ee30746c63eb2186a6251b4fc9119f8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ee30746c63eb2186a6251b4fc9119f8/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 9032112f05ffea291a887ffdfb78c55efb8f7c20..13d17b955fe63fd8ada5685f817895188e3c9abf 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="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!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ebe24e2b67b22e6734fa48156d5a301/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ebe24e2b67b22e6734fa48156d5a301/res" />
     </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 be3d8c818361cd0fea93fe02691231c005e448da..165bca097d6abb7977fbc373a1d9032b07e0a116 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="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!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e5742b302aa803638589a3b903fcbe48/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e5742b302aa803638589a3b903fcbe48/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 10773c4ccb643e4372cdebf30a836705fa9b4b4b..56c8102415d4d08327ffc8e1ebb8fb678d1ab97d 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="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!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d828696aa497d1650024fec778ab5150/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d828696aa497d1650024fec778ab5150/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_places_placereport_16_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_places_placereport_16_0_0_aar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..75cdc428e9903432ad091577d8df0f348f9ff664
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_places_placereport_16_0_0_aar.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="Gradle: com.google.android.gms:play-services-places-placereport:16.0.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/544edd79b93032c2db7502405d1379ad/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/544edd79b93032c2db7502405d1379ad/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
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 bb2ba4f84c7a54357a87aa316236869ad978e931..fe0d2af215a3dbfda2244b79f21652a17ffa5283 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="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" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/38703f9776ba9f10dd3efdde11d08328/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/38703f9776ba9f10dd3efdde11d08328/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 3c669467e5e1aeb80a8f78cb021562957d4de1eb..936ab5b22da0ec88f65cd48ce899a65e19c3d3c2 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="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" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d9a65cf708e7da39e775b6754574fb8d/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d9a65cf708e7da39e775b6754574fb8d/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 e24e2ec1639c8cebd7019b5f1dc588bcf88ea961..d581158e67d972e61cb4af2df147165915be0737 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="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!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/05aaad10cf023846f4e479b7d0d9e83a/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/05aaad10cf023846f4e479b7d0d9e83a/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 676397cda559c241d9e2d5c600a1cf7b9d67836f..9250a7a71ce11217043cfe797244ae7cd96a8b1d 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="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!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cca49277aea77119cba2e35273dd9768/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cca49277aea77119cba2e35273dd9768/res" />
     </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 65e40550c174def3f411a24ed768552658cba9b4..f5a4cf3a76b0fa98acb25f758ee5805d86ff916d 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-2/files-2.1/20596d78b2d8a94639c97884f3a41026/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/20596d78b2d8a94639c97884f3a41026/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ab311d660699b5f7ac4a67e2b96fa4c5/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ab311d660699b5f7ac4a67e2b96fa4c5/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 ad4f82a013d8d553f2a44c6277e485f9160852af..9ea95ab8cfbb4819a7ac257b16d78ffed5c2321c 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-2/files-2.1/b5b4ca6f4b15765b2de2cc8d620fdef5/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b5b4ca6f4b15765b2de2cc8d620fdef5/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/87d6202a37dc4c9c4978dffa4d93714c/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/87d6202a37dc4c9c4978dffa4d93714c/res" />
     </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 c4effd4299e942654f1b14ca8905029c01bbd3f9..0ee75ff79db90bfdbb47851f9b7ab3e3cef4966d 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-2/files-2.1/18911012d24ac84ba2dc95391505ee64/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/18911012d24ac84ba2dc95391505ee64/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/88a9fce8d404e5f5cef4763fea05244f/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/88a9fce8d404e5f5cef4763fea05244f/res" />
     </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 01b83b6ab7af99d32d86b5b82600598b3e727a60..fd99e2aa327f38ea535c6083465de68592e50a6d 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-2/files-2.1/d1bff41cd2499e507fe98f6018374fc0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d1bff41cd2499e507fe98f6018374fc0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a1be0db2fd5cb278a94feeec1c2552ba/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a1be0db2fd5cb278a94feeec1c2552ba/jars/classes.jar!/" />
     </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 b35685b46057832fb57d019f1e443971e0db569b..faed6aa1f0bb4109433ec02c083f9a87289522f3 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="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!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ddc6ed91afc63249b83c2942ad1249f/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ddc6ed91afc63249b83c2942ad1249f/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 b9f8587908766fe9a8358addbf833c7dea2a3046..bf4250f1b7dee522e0a8ff39ded6a37db3f3c1dc 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="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" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0801de71e7a36e2562cc85b1ddea38aa/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0801de71e7a36e2562cc85b1ddea38aa/jars/classes.jar!/" />
     </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 be52063ac88773df991f0fc55813f5b5ac6ab7de..1c0365a54f3e1a813c49cf2be71f12b22b8651dd 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-2/files-2.1/952da532928014f66f7a88175825eb8d/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/952da532928014f66f7a88175825eb8d/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/46254619ca981c4beabaa0604579a08e/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/46254619ca981c4beabaa0604579a08e/res" />
     </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 c48b810667f349a49a80a50a33d7e36d8951466c..66f90853afc78866e938a85e0cae369b53411a12 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="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!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e2d001fc645ed6b99bd9557184fdb2b/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e2d001fc645ed6b99bd9557184fdb2b/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index ce497f7a8032afd312d85b16060708e4117d0263..28226e39988a590b253e71596589b79b81acda31 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/local.properties b/local.properties
index 23fa81dd0f135648b1b2f651f13aeca4764b5850..4de9d2b2f4ec0adce28e01e514fb7796b375f570 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.
-#Fri Apr 19 19:30:09 BST 2019
-sdk.dir=C\:\\Users\\m_wu\\AppData\\Local\\Android\\Sdk
+#Fri Apr 19 23:48:56 BST 2019
+sdk.dir=C\:\\Users\\james\\AppData\\Local\\Android\\Sdk
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 922e33407ae20a346ab34f63ce2770ac71fe8e17..260824dbff6dbdf10366d393ce4f7a84074b8380 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -6,10 +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_COARSE_LOCATION"/>
+    <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.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" />
@@ -22,7 +22,6 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
         <!--
              The API key for Google Maps-based APIs is defined as a string resource.
              (See the file "res/values/google_maps_api.xml").
@@ -37,6 +36,7 @@
 
         <activity
             android:name=".Homepage"
+            android:label="@string/app_name"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -50,26 +50,36 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".Register"
+            android:label="@string/register"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".Driver_Register"
+            android:label="@string/register"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".User_Register"
+            android:label="@string/register"
             android:screenOrientation="portrait" />
-
         <activity
-            android:name=".Main"
+            android:name=".Driver_Main"
+            android:label="Home"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".User_Main"
             android:label="Home"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".Map"
-            android:label="@string/title_activity_map"
-            android:parentActivityName=".Main"/>
-
+            android:label="@string/title_activity_map" />
+        <activity
+            android:name=".Route"
+            android:label="@string/create_route" />
         <activity
             android:name=".Profile"
-            android:label="@string/profile"
-            android:parentActivityName=".Main"/>
+            android:label="@string/profile" />
         <activity
             android:name=".Settings"
-            android:label="@string/settings"
-            android:parentActivityName=".Main"/>
+            android:label="@string/settings" />
 
     </application>
 
diff --git a/src/main/java/com/example/liliyayankova/unirides/Driver_Main.java b/src/main/java/com/example/liliyayankova/unirides/Driver_Main.java
new file mode 100644
index 0000000000000000000000000000000000000000..62b3ed75b2df508313a3d57b3cb7f8671d6a050c
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/Driver_Main.java
@@ -0,0 +1,104 @@
+package com.example.liliyayankova.unirides;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.Toast;
+
+public class Driver_Main extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_driver_main);
+
+        //setting the user_toolbar layout as the action bar
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        try {
+            setSupportActionBar(toolbar);
+        } catch (Exception e) {
+            Log.e("TOOLBAR", e.toString());
+        }
+
+        ImageButton view_map_button = findViewById(R.id.view_route_button);
+        view_map_button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent map_i = new Intent(Driver_Main.this, Map.class);
+                startActivity(map_i);
+            }
+        });
+
+        ImageButton create_route_button = findViewById(R.id.create_route_button);
+        create_route_button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent route_i = new Intent(Driver_Main.this, Route.class);
+                startActivity(route_i);
+            }
+        });
+
+    }
+
+    //Override for the user_toolbar menu items
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater menuInflater = getMenuInflater();
+        menuInflater.inflate(R.menu.toolbar_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        //checks the id of the item, if the item id matches a case id then the code in that case block will execute
+        switch(item.getItemId()){
+
+            case(R.id.item_home):
+
+                //already home, so do nothing.
+                return true;
+
+            case(R.id.item_logout):
+
+                /*
+                TODO:
+                    Possibly add a way to log out here? (not sure if we are even tracking the login instance
+                    within each activity? as far as I understand the login just gets you to the next activity
+                    however if you "logout" and just press the back button after it takes you back to the homepage
+                    it will act as if you are still logged in when you reenter).
+                    for now i have just set it so it goes back to the homepage (where you can register or login).
+                 */
+
+                Toast.makeText(Driver_Main.this, "successfully logged out", Toast.LENGTH_SHORT).show();
+                Intent logout_i = new Intent(Driver_Main.this, Homepage.class);
+                startActivity(logout_i);
+
+                return true;
+
+            case(R.id.item_profile):
+
+                Intent profile_i = new Intent(Driver_Main.this, Profile.class);
+                profile_i.putExtra("userType", Login.userType.DRIVER);
+                startActivity(profile_i);
+                return true;
+
+            case(R.id.item_settings):
+
+                Intent settings_i = new Intent(Driver_Main.this, Settings.class);
+                settings_i.putExtra("userType", Login.userType.DRIVER);
+                startActivity(settings_i);
+                return true;
+
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/liliyayankova/unirides/Driver_Register.java b/src/main/java/com/example/liliyayankova/unirides/Driver_Register.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b9625d084a68aac4738001bbdaeaec1ceb33662
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/Driver_Register.java
@@ -0,0 +1,127 @@
+package com.example.liliyayankova.unirides;
+
+import android.content.Intent;
+import android.support.annotation.NonNull;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.AuthResult;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+
+public class Driver_Register extends AppCompatActivity {
+    private EditText forename;
+    private EditText surname;
+    private EditText email;
+    private EditText password;
+    private EditText age;
+    private EditText car_model;
+    private EditText licence_plate;
+    private EditText time_driving;
+    private Button sign_up;
+
+    /* Used for Firebase authorisation in creating a new account */
+    private FirebaseAuth firebaseAuth;
+
+    /* Allows access to the Firebase Database */
+    private FirebaseDatabase firebaseDatabase;
+
+    /* Used to add values to the database */
+    private DatabaseReference dbReference;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_driver_register);
+        this.forename = findViewById(R.id.forename);
+        this.surname = findViewById(R.id.surname);
+        this.email = findViewById(R.id.email);
+        this.password = findViewById(R.id.password);
+        this.age = findViewById(R.id.age);
+        this.car_model = findViewById(R.id.car_model);
+        this.licence_plate = findViewById(R.id.license_plate);
+        this.time_driving = findViewById(R.id.time_driving);
+        this.sign_up = findViewById(R.id.signup_button);
+
+        this.firebaseAuth = FirebaseAuth.getInstance();
+        this.firebaseDatabase = FirebaseDatabase.getInstance();
+        this.dbReference = firebaseDatabase.getReference();
+
+        //sign_up button listener
+        sign_up.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                //execute register method
+                registerClick(view);
+            }
+        });
+
+    }
+
+    public void registerClick(View v) {
+        final String forenameText = forename.getText().toString().trim();
+        final String surnameText = surname.getText().toString().trim();
+        final String emailText = email.getText().toString().trim();
+        final String passwordText = password.getText().toString().trim();
+        final String ageText = age.getText().toString().trim();
+
+        final String carModelText = car_model.getText().toString().trim();
+        final String licencePlateText = licence_plate.getText().toString().trim();
+        final String timeDrivingText = time_driving.getText().toString().trim();
+
+        Log.d("Email", emailText);
+        Log.d("Password", passwordText);
+
+        if(TextUtils.isEmpty(forenameText) || TextUtils.isEmpty(surnameText)
+                || TextUtils.isEmpty(emailText) || TextUtils.isEmpty(passwordText)
+                || TextUtils.isEmpty(passwordText) || TextUtils.isEmpty(ageText)) {
+            Toast.makeText(this, "One of the fields is empty!",Toast.LENGTH_SHORT).show();
+
+        }
+        else {
+            firebaseAuth.createUserWithEmailAndPassword(emailText, passwordText)
+                    .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
+                        @Override
+                        public void onComplete(@NonNull Task<AuthResult> task) {
+                            if(task.isSuccessful()) {
+                                FirebaseUser user = firebaseAuth.getCurrentUser();
+                                String userId = user.getUid();
+                                Toast.makeText(Driver_Register.this, forenameText,Toast.LENGTH_SHORT).show();
+
+                                // Code to add values into the database
+                                // Only temporary for now, might change these a bit later
+                                dbReference.child("drivers").child(userId).child("first_name").setValue(forenameText);
+                                dbReference.child("drivers").child(userId).child("last_name").setValue(surnameText);
+                                dbReference.child("drivers").child(userId).child("age").setValue(ageText);
+                                dbReference.child("drivers").child(userId).child("email").setValue(emailText);
+                                dbReference.child("drivers").child(userId).child("average_rating").setValue(0.0);
+                                dbReference.child("drivers").child(userId).child("car_model").setValue(carModelText);
+                                dbReference.child("drivers").child(userId).child("license_plate").setValue(licencePlateText);
+                                dbReference.child("drivers").child(userId).child("time_driving").setValue(timeDrivingText);
+
+                                //finish();
+                                Toast.makeText(Driver_Register.this, "registration successful",Toast.LENGTH_SHORT).show();
+                                Intent home = new Intent(Driver_Register.this, Homepage.class);
+                                startActivity(home);
+
+                            }
+                            else {
+                                Toast.makeText(Driver_Register.this, "registration not successful",Toast.LENGTH_SHORT).show();
+                            }
+                        }
+                    });
+        }
+
+    }
+
+}
diff --git a/src/main/java/com/example/liliyayankova/unirides/Login.java b/src/main/java/com/example/liliyayankova/unirides/Login.java
index 7ea1919d9a9efbc137ba03db1e2df0eb63a72f3e..98c2f2da15c22b5a211aaa175a06da528211a43a 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Login.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Login.java
@@ -33,12 +33,20 @@ import android.widget.Toast;
 
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
+import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseNetworkException;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
 import com.google.firebase.auth.FirebaseAuthInvalidUserException;
 import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.auth.UserInfo;
+import com.google.firebase.database.ChildEventListener;
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.database.ValueEventListener;
 
 
 import java.util.ArrayList;
@@ -80,6 +88,9 @@ public class Login extends AppCompatActivity implements LoaderCallbacks<Cursor>
     /* Connects to Firebase and checks if authorisation was successful */
     private FirebaseAuth.AuthStateListener authListener;
 
+    /* Enum for user type - used in bundles when going back and forth between activities */
+    public enum userType {DRIVER, PASSENGER};
+
     /*
     TODO: Look at this message from Ronan in Login.java
     To be honest, I have no idea what any of this code does prior to my commit
@@ -101,8 +112,7 @@ public class Login extends AppCompatActivity implements LoaderCallbacks<Cursor>
                 FirebaseUser user = firebaseAuth.getCurrentUser();
                 if(user != null) {
                     // User is already logged in, so automatically let them into the app
-                    Toast.makeText(Login.this, "User has signed in as" + user.getEmail(), Toast.LENGTH_SHORT).show();
-                    startActivity(new Intent(Login.this, Map.class));
+                    changeActivity();
                 }
             }
         };
@@ -154,9 +164,10 @@ public class Login extends AppCompatActivity implements LoaderCallbacks<Cursor>
                                 }
 
                             } else {
+
                                 // successful - closes login page and sends user to main menu
                                 finish();
-                                startActivity(new Intent(Login.this, Main.class));
+                                changeActivity();
                             }
                         }
                     });
@@ -171,6 +182,60 @@ public class Login extends AppCompatActivity implements LoaderCallbacks<Cursor>
         mProgressView = findViewById(R.id.login_progress);
     }
 
+    /**
+     * Method for changing the activity to either the driver or passenger activity after login
+     * This method is only called AFTER a user's credentials have already been confirmed by the
+     * server, it should never be called to confirm a users identity.
+     */
+    public void changeActivity(){
+
+        /*
+         * TODO: make this more efficient as it currently goes through all the users (as far as i can tell)
+            * Therefore it takes more than a split second to switch activities.
+             * may need to disable user input or create a small loading screen if we can't fix this
+             * because you can still interact with the activity while the next one loads! - James
+         */
+
+        //checks if user is a driver or passenger
+        FirebaseUser user = firebaseAuth.getCurrentUser();
+        final String user_id = user.getUid();
+
+        DatabaseReference ref = FirebaseDatabase.getInstance().getReference();
+        ref.child("drivers").child(user_id).addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
+
+                if(dataSnapshot.exists()){
+
+                    //TODO: remove this or change it - toast to confirm that the user is indeed a driver during testing
+                    Toast.makeText(Login.this, "Welcome back Driver!", Toast.LENGTH_SHORT).show();
+                    startActivity(new Intent(Login.this, Driver_Main.class));
+
+                }else{
+
+                    /*
+                     * no other option as the user has already logged in before this method is called, hence they must be a passenger
+                     * if they are not a driver
+                     */
+                    //TODO: remove this or change it - toast to confirm that the user is NOT a driver during testing
+                    Toast.makeText(Login.this, "Welcome back Passenger!", Toast.LENGTH_LONG).show();
+                    startActivity(new Intent(Login.this, User_Main.class));
+                }
+
+            }
+
+            @Override
+            public void onCancelled(@NonNull DatabaseError databaseError) {
+                //TODO: throw exception?
+                //assume they're a user?
+                startActivity(new Intent(Login.this, User_Main.class));
+            }
+
+        });
+
+
+    }
+
     private void populateAutoComplete() {
         if (!mayRequestContacts()) {
             return;
@@ -269,7 +334,7 @@ public class Login extends AppCompatActivity implements LoaderCallbacks<Cursor>
 
     private boolean isEmailValid(String email) {
         //TODO: Replace this with your own logic
-        return email.contains("@");
+        return email.contains("@surrey.ac.uk");
     }
 
     private boolean isPasswordValid(String password) {
@@ -411,8 +476,7 @@ public class Login extends AppCompatActivity implements LoaderCallbacks<Cursor>
 
             if (success) {
                 //go to the main activity
-                Intent main = new Intent(Login.this, Main.class);
-                startActivity(main);
+                changeActivity();
             } else {
                 mPasswordView.setError(getString(R.string.error_incorrect_password));
                 mPasswordView.requestFocus();
diff --git a/src/main/java/com/example/liliyayankova/unirides/Map.java b/src/main/java/com/example/liliyayankova/unirides/Map.java
index e5c4c1b3835f4ccdba4340ac06f0702020dab9f3..bb4ec8bd0e6abc06c4307c0efd224f3eb7f0c598 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Map.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Map.java
@@ -1,6 +1,7 @@
 package com.example.liliyayankova.unirides;
 
 import android.Manifest;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.location.Location;
@@ -12,6 +13,12 @@ import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.FragmentActivity;
 import android.os.Bundle;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.widget.Toast;
 
 import com.google.android.gms.common.ConnectionResult;
@@ -29,7 +36,7 @@ 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
+public class Map extends AppCompatActivity implements
         OnMapReadyCallback,
         GoogleApiClient.ConnectionCallbacks,
         GoogleApiClient.OnConnectionFailedListener,
@@ -57,6 +64,14 @@ public class Map extends FragmentActivity implements
 
         locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
 
+        //setting the user_toolbar layout as the action bar
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        try {
+            setSupportActionBar(toolbar);
+        } catch (Exception e) {
+            Log.e("TOOLBAR", e.toString());
+        }
+
     }
 
     @Override
@@ -133,8 +148,13 @@ public class Map extends FragmentActivity implements
         markerOptions.icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_CYAN));
         myLocation = mMap.addMarker(markerOptions);
 
-        mMap.moveCamera(CameraUpdateFactory.newLatLng(latLng));
-        mMap.animateCamera(CameraUpdateFactory.zoomBy(10));
+        /* Updated this part so that it zooms in on the location, as it was buggy with me, I've left
+         * the original code commented out as it may be useful for if your location is updated?
+         * Either way this works for me at the moment & doesn't default me to the ocean lmao - James
+         */
+        float zoomLevel = 15.0f;
+        mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, zoomLevel));
+        //mMap.animateCamera(CameraUpdateFactory.zoomBy(10));
 
         if(mGoogleApiClient != null){
             LocationServices.FusedLocationApi.removeLocationUpdates(mGoogleApiClient, this);
@@ -166,4 +186,62 @@ public class Map extends FragmentActivity implements
     public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
 
     }
+
+    //Override for the user_toolbar menu items
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater menuInflater = getMenuInflater();
+        menuInflater.inflate(R.menu.toolbar_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        //checks the id of the item, if the item id matches a case id then the code in that case block will execute
+        switch(item.getItemId()){
+
+            case(R.id.item_home):
+
+                Intent home_i = new Intent(Map.this, Driver_Main.class);
+                startActivity(home_i);
+                return true;
+
+
+            case(R.id.item_logout):
+
+                /*
+                TODO:
+                    Possibly add a way to log out here? (not sure if we are even tracking the login instance
+                    within each activity? as far as I understand the login just gets you to the next activity
+                    however if you "logout" and just press the back button after it takes you back to the homepage
+                    it will act as if you are still logged in when you reenter).
+                    for now i have just set it so it goes back to the homepage (where you can register or login).
+                 */
+
+                Toast.makeText(Map.this, "successfully logged out", Toast.LENGTH_SHORT).show();
+                Intent logout_i = new Intent(Map.this, Homepage.class);
+                startActivity(logout_i);
+
+                return true;
+
+            case(R.id.item_profile):
+
+                Intent profile_i = new Intent(Map.this, Profile.class);
+                profile_i.putExtra("userType", Login.userType.DRIVER);
+                startActivity(profile_i);
+
+                return true;
+
+            case(R.id.item_settings):
+
+                Intent settings_i = new Intent(Map.this, Settings.class);
+                settings_i.putExtra("userType", Login.userType.DRIVER);
+                startActivity(settings_i);
+                return true;
+
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
 }
diff --git a/src/main/java/com/example/liliyayankova/unirides/Profile.java b/src/main/java/com/example/liliyayankova/unirides/Profile.java
index cf081af72b7843556868f0b6a9ccae25dfb50d90..cb3c80b38319da3d732d86dd5b94a636349b11ad 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Profile.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Profile.java
@@ -12,12 +12,27 @@ import android.widget.Toast;
 
 public class Profile extends AppCompatActivity {
 
+    //TODO: layout and functionality of profile activity needs to be done!
+
+    private boolean isDriver;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_profile);
 
-        //setting the toolbar layout as the action bar
+        //assume the user is a passenger (isDriver = false) unless bundle extra userType value is DRIVER
+        isDriver = false;
+
+        /* checking if there are any bundle extras (should be the userType) */
+        if(getIntent().getExtras() != null) {
+            //setting userType to this result (DRIVER or PASSENGER)
+            if(getIntent().getExtras().get("userType") == Login.userType.DRIVER){
+                isDriver = true;
+            }
+        }
+
+        //setting the user_toolbar layout as the action bar
         Toolbar toolbar = findViewById(R.id.toolbar);
         try {
             setSupportActionBar(toolbar);
@@ -26,7 +41,7 @@ public class Profile extends AppCompatActivity {
         }
     }
 
-    //Override for the toolbar menu items
+    //Override for the user_toolbar menu items
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater menuInflater = getMenuInflater();
@@ -42,19 +57,26 @@ public class Profile extends AppCompatActivity {
 
             case(R.id.item_home):
 
-                Intent home_i = new Intent(Profile.this, Main.class);
-                startActivity(home_i);
-                return true;
+                if (isDriver) {
+                    Intent home_i = new Intent(Profile.this, Driver_Main.class);
+                    startActivity(home_i);
+                    return true;
+                }else{
+                    Intent home_i = new Intent(Profile.this, User_Main.class);
+                    startActivity(home_i);
+                    return true;
+                }
+
 
             case(R.id.item_logout):
 
-                /** TODO:
-                 *  Possibly add a way to log out here? (not sure if we are even tracking the login instance
-                 *  within each activity? as far as I understand the login just gets you to the next activity
-                 *  however if you "logout" and just press the back button after it takes you back to the homepage
-                 *  it will act as if you are still logged in when you reenter).
-                 *
-                 *  -- for now i have just set it so it goes back to the homepage.
+                /*
+                TODO:
+                    Possibly add a way to log out here? (not sure if we are even tracking the login instance
+                    within each activity? as far as I understand the login just gets you to the next activity
+                    however if you "logout" and just press the back button after it takes you back to the homepage
+                    it will act as if you are still logged in when you reenter).
+                    for now i have just set it so it goes back to the homepage (where you can register or login).
                  */
 
                 Toast.makeText(Profile.this, "successfully logged out", Toast.LENGTH_SHORT).show();
@@ -65,14 +87,21 @@ public class Profile extends AppCompatActivity {
 
             case(R.id.item_profile):
 
-                Intent profile_i = new Intent(Profile.this, Profile.class);
-                startActivity(profile_i);
+                //do nothing (we're already in settings)
                 return true;
 
             case(R.id.item_settings):
 
                 Intent settings_i = new Intent(Profile.this, Settings.class);
+
+                if(isDriver){
+                    settings_i.putExtra("userType", Login.userType.DRIVER);
+                }else{
+                    settings_i.putExtra("userType", Login.userType.PASSENGER);
+                }
+
                 startActivity(settings_i);
+
                 return true;
 
         }
diff --git a/src/main/java/com/example/liliyayankova/unirides/Register.java b/src/main/java/com/example/liliyayankova/unirides/Register.java
index 625026da6234486204b16d672058f44a3fbf80cb..04c90200c37a13a52046b4d53fd5b9de3e6e986d 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Register.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Register.java
@@ -1,115 +1,37 @@
 package com.example.liliyayankova.unirides;
 
 import android.content.Intent;
-import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.Switch;
-import android.widget.Toast;
-
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.Task;
-import com.google.firebase.auth.AuthResult;
-import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.FirebaseUser;
-import com.google.firebase.database.DatabaseReference;
-import com.google.firebase.database.FirebaseDatabase;
 
 public class Register extends AppCompatActivity {
-    private EditText forename;
-    private EditText surname;
-    private EditText email;
-    private EditText password;
-    private EditText age;
-    private Button register;
-    private CheckBox driverBox;
-
-    /* Used for Firebase authorisation in creating a new account */
-    private FirebaseAuth firebaseAuth;
-
-    /* Allows access to the Firebase Database */
-    private FirebaseDatabase firebaseDatabase;
-
-    /* Used to add values to the database */
-    private DatabaseReference dbReference;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_register);
-        this.forename = (EditText) findViewById(R.id.forename);
-        this.surname = (EditText) findViewById(R.id.surname);
-        this.email = (EditText) findViewById(R.id.email);
-        this.password = (EditText) findViewById(R.id.password);
-        this.age = (EditText) findViewById(R.id.age);
-        this.register = (Button) findViewById(R.id.signup);
-        this.driverBox = (CheckBox) findViewById(R.id.checkBox_driver);
-        this.firebaseAuth = FirebaseAuth.getInstance();
-        this.firebaseDatabase = FirebaseDatabase.getInstance();
-        this.dbReference = firebaseDatabase.getReference();
-    }
-
-    public void registerClick(View v) {
-        final String forenameText = forename.getText().toString().trim();
-        final String surnameText = surname.getText().toString().trim();
-        final String emailText = email.getText().toString().trim();
-        final String passwordText = password.getText().toString().trim();
-        final String ageText = age.getText().toString().trim();
-        Log.d("Email", emailText);
-        Log.d("Password", passwordText);
-
-        if(TextUtils.isEmpty(forenameText) || TextUtils.isEmpty(surnameText)
-        || TextUtils.isEmpty(emailText) || TextUtils.isEmpty(passwordText)
-        || TextUtils.isEmpty(passwordText) || TextUtils.isEmpty(ageText)) {
-            Toast.makeText(this, "One of the fields is empty!",Toast.LENGTH_SHORT).show();
-
-        }
-
-        else {
-            firebaseAuth.createUserWithEmailAndPassword(emailText, passwordText)
-                    .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
-                        @Override
-                        public void onComplete(@NonNull Task<AuthResult> task) {
-                            if(task.isSuccessful()) {
-                                FirebaseUser user = firebaseAuth.getCurrentUser();
-                                String userId = user.getUid();
-                                Toast.makeText(Register.this, forenameText,Toast.LENGTH_SHORT).show();
-
-                                // Code to add values into the database
-                                // Only temporary for now, might change these a bit later
-                                dbReference.child("icon_users").child(userId).child("first_name").setValue(forenameText);
-                                dbReference.child("icon_users").child(userId).child("last_name").setValue(surnameText);
-                                dbReference.child("icon_users").child(userId).child("age").setValue(ageText);
-                                dbReference.child("icon_users").child(userId).child("email").setValue(emailText);
-                                dbReference.child("icon_users").child(userId).child("average_rating").setValue(0.0);
-                                if (driverBox.isChecked()) {
-                                    dbReference.child("drivers").child(userId).child("car_model").setValue("a really cool car B)");
-                                    dbReference.child("drivers").child(userId).child("license_plate").setValue("TEST PLATE");
-                                    dbReference.child("drivers").child(userId).child("time_driving").setValue("5 years");
-                                    dbReference.child("icon_users").child(userId).child("driver").setValue(true);
-                                }
-                                else {
-                                    dbReference.child("icon_users").child(userId).child("driver").setValue(false);
-                                }
-                                //finish();
-                                Toast.makeText(Register.this, "registration successful",Toast.LENGTH_SHORT).show();
-                                Intent home = new Intent(Register.this, Homepage.class);
-                                startActivity(home);
-
-                            }
-                            else {
-                                Toast.makeText(Register.this, "registration not successful",Toast.LENGTH_SHORT).show();
-                            }
-                        }
-                    });
-        }
 
+        Button user_register = findViewById(R.id.user_signup);
+        Button driver_register = findViewById(R.id.driver_signup);
+
+        //user button listener
+        user_register.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent i = new Intent(Register.this, User_Register.class);
+                startActivity(i);
+            }
+        });
+
+        //driver button listener
+        driver_register.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent i = new Intent(Register.this, Driver_Register.class);
+                startActivity(i);
+            }
+        });
     }
-
 }
diff --git a/src/main/java/com/example/liliyayankova/unirides/Route.java b/src/main/java/com/example/liliyayankova/unirides/Route.java
new file mode 100644
index 0000000000000000000000000000000000000000..8ce8969b15fc4fa539fa3181df4ccfcf3448bf8b
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/Route.java
@@ -0,0 +1,89 @@
+package com.example.liliyayankova.unirides;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+public class Route extends AppCompatActivity {
+
+    //TODO: This entire activity for creating and posting routes needs to be done.
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_route);
+
+        //setting the user_toolbar layout as the action bar
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        try {
+            setSupportActionBar(toolbar);
+        } catch (Exception e) {
+            Log.e("TOOLBAR", e.toString());
+        }
+
+    }
+
+    //Override for the user_toolbar menu items
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater menuInflater = getMenuInflater();
+        menuInflater.inflate(R.menu.toolbar_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        //checks the id of the item, if the item id matches a case id then the code in that case block will execute
+        switch(item.getItemId()){
+
+            case(R.id.item_home):
+
+                Intent home_i = new Intent(Route.this, Driver_Main.class);
+                startActivity(home_i);
+                return true;
+
+
+            case(R.id.item_logout):
+
+                /*
+                TODO:
+                    Possibly add a way to log out here? (not sure if we are even tracking the login instance
+                    within each activity? as far as I understand the login just gets you to the next activity
+                    however if you "logout" and just press the back button after it takes you back to the homepage
+                    it will act as if you are still logged in when you reenter).
+                    for now i have just set it so it goes back to the homepage (where you can register or login).
+                 */
+
+                Toast.makeText(Route.this, "successfully logged out", Toast.LENGTH_SHORT).show();
+                Intent logout_i = new Intent(Route.this, Homepage.class);
+                startActivity(logout_i);
+
+                return true;
+
+            case(R.id.item_profile):
+
+                Intent profile_i = new Intent(Route.this, Profile.class);
+                profile_i.putExtra("userType", Login.userType.DRIVER);
+                startActivity(profile_i);
+
+                return true;
+
+            case(R.id.item_settings):
+
+                Intent settings_i = new Intent(Route.this, Settings.class);
+                settings_i.putExtra("userType", Login.userType.DRIVER);
+                startActivity(settings_i);
+                return true;
+
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/src/main/java/com/example/liliyayankova/unirides/Settings.java b/src/main/java/com/example/liliyayankova/unirides/Settings.java
index e31a6c286fa78ba47ece672473e5f616f9d7c858..fd107c50802332865e7be0bac3a356f74ba3c967 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Settings.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Settings.java
@@ -12,12 +12,27 @@ import android.widget.Toast;
 
 public class Settings extends AppCompatActivity {
 
+    //TODO: layout and functionality of settings activity need to be done!
+
+    private boolean isDriver;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);
 
-        //setting the toolbar layout as the action bar
+        //assume the user is a passenger (isDriver = false) unless bundle extra userType value is DRIVER
+        isDriver = false;
+
+        /* checking if there are any bundle extras (should be the userType) */
+        if(getIntent().getExtras() != null) {
+            //setting userType to this result (DRIVER or PASSENGER)
+            if(getIntent().getExtras().get("userType") == Login.userType.DRIVER){
+                isDriver = true;
+            }
+        }
+
+        //setting the user_toolbar layout as the action bar
         Toolbar toolbar = findViewById(R.id.toolbar);
         try {
             setSupportActionBar(toolbar);
@@ -26,7 +41,7 @@ public class Settings extends AppCompatActivity {
         }
     }
 
-    //Override for the toolbar menu items
+    //Override for the user_toolbar menu items
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater menuInflater = getMenuInflater();
@@ -42,19 +57,25 @@ public class Settings extends AppCompatActivity {
 
             case(R.id.item_home):
 
-                Intent home_i = new Intent(Settings.this, Main.class);
-                startActivity(home_i);
-                return true;
+                if (isDriver) {
+                    Intent home_i = new Intent(Settings.this, Driver_Main.class);
+                    startActivity(home_i);
+                    return true;
+                }else{
+                    Intent home_i = new Intent(Settings.this, User_Main.class);
+                    startActivity(home_i);
+                    return true;
+                }
 
             case(R.id.item_logout):
 
-                /** TODO:
-                 *  Possibly add a way to log out here? (not sure if we are even tracking the login instance
-                 *  within each activity? as far as I understand the login just gets you to the next activity
-                 *  however if you "logout" and just press the back button after it takes you back to the homepage
-                 *  it will act as if you are still logged in when you reenter).
-                 *
-                 *  -- for now i have just set it so it goes back to the homepage.
+                /*
+                TODO:
+                    Possibly add a way to log out here? (not sure if we are even tracking the login instance
+                    within each activity? as far as I understand the login just gets you to the next activity
+                    however if you "logout" and just press the back button after it takes you back to the homepage
+                    it will act as if you are still logged in when you reenter).
+                    for now i have just set it so it goes back to the homepage (where you can register or login).
                  */
 
                 Toast.makeText(Settings.this, "successfully logged out", Toast.LENGTH_SHORT).show();
@@ -66,13 +87,20 @@ public class Settings extends AppCompatActivity {
             case(R.id.item_profile):
 
                 Intent profile_i = new Intent(Settings.this, Profile.class);
+
+                if(isDriver){
+                    profile_i.putExtra("userType", Login.userType.DRIVER);
+                }else{
+                    profile_i.putExtra("userType", Login.userType.PASSENGER);
+                }
+
                 startActivity(profile_i);
+
                 return true;
 
             case(R.id.item_settings):
 
-                Intent settings_i = new Intent(Settings.this, Settings.class);
-                startActivity(settings_i);
+                //do nothing (already on the settings page)
                 return true;
 
         }
diff --git a/src/main/java/com/example/liliyayankova/unirides/Main.java b/src/main/java/com/example/liliyayankova/unirides/User_Main.java
similarity index 62%
rename from src/main/java/com/example/liliyayankova/unirides/Main.java
rename to src/main/java/com/example/liliyayankova/unirides/User_Main.java
index 7d43874c6a0adcf268cec6d75793e2078beee8a3..b2bb785e00ea2eea4059eff1aeae4a68188178bf 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Main.java
+++ b/src/main/java/com/example/liliyayankova/unirides/User_Main.java
@@ -9,18 +9,17 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.Toast;
 
-public class Main extends AppCompatActivity {
+public class User_Main extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        setContentView(R.layout.activity_user_main);
 
-        //setting the toolbar layout as the action bar
+        //setting the user_toolbar layout as the action bar
         Toolbar toolbar = findViewById(R.id.toolbar);
         try {
             setSupportActionBar(toolbar);
@@ -28,18 +27,18 @@ public class Main extends AppCompatActivity {
             Log.e("TOOLBAR", e.toString());
         }
 
-        ImageButton map_button = (ImageButton) findViewById(R.id.mapview_button);
+        ImageButton map_button = findViewById(R.id.view_route_button);
         map_button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent map_i = new Intent(Main.this, Map.class);
+                Intent map_i = new Intent(User_Main.this, Map.class);
                 startActivity(map_i);
             }
         });
 
     }
 
-    //Override for the toolbar menu items
+    //Override for the user_toolbar menu items
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater menuInflater = getMenuInflater();
@@ -60,30 +59,32 @@ public class Main extends AppCompatActivity {
 
             case(R.id.item_logout):
 
-                /** TODO:
-                 *  Possibly add a way to log out here? (not sure if we are even tracking the login instance
-                 *  within each activity? as far as I understand the login just gets you to the next activity
-                 *  however if you "logout" and just press the back button after it takes you back to the homepage
-                 *  it will act as if you are still logged in when you reenter).
-                 *
-                 *  -- for now i have just set it so it goes back to the homepage.
+                /*
+                TODO:
+                    Possibly add a way to log out here? (not sure if we are even tracking the login instance
+                    within each activity? as far as I understand the login just gets you to the next activity
+                    however if you "logout" and just press the back button after it takes you back to the homepage
+                    it will act as if you are still logged in when you reenter).
+                    for now i have just set it so it goes back to the homepage (where you can register or login).
                  */
 
-                Toast.makeText(Main.this, "successfully logged out", Toast.LENGTH_SHORT).show();
-                Intent logout_i = new Intent(Main.this, Homepage.class);
+                Toast.makeText(User_Main.this, "successfully logged out", Toast.LENGTH_SHORT).show();
+                Intent logout_i = new Intent(User_Main.this, Homepage.class);
                 startActivity(logout_i);
 
                 return true;
 
             case(R.id.item_profile):
 
-                Intent profile_i = new Intent(Main.this, Profile.class);
+                Intent profile_i = new Intent(User_Main.this, Profile.class);
+                profile_i.putExtra("userType", Login.userType.PASSENGER);
                 startActivity(profile_i);
                 return true;
 
             case(R.id.item_settings):
 
-                Intent settings_i = new Intent(Main.this, Settings.class);
+                Intent settings_i = new Intent(User_Main.this, Settings.class);
+                settings_i.putExtra("userType", Login.userType.PASSENGER);
                 startActivity(settings_i);
                 return true;
 
diff --git a/src/main/java/com/example/liliyayankova/unirides/User_Register.java b/src/main/java/com/example/liliyayankova/unirides/User_Register.java
new file mode 100644
index 0000000000000000000000000000000000000000..55fcee015b97f21a70c2b060b4938785638c4868
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/User_Register.java
@@ -0,0 +1,117 @@
+package com.example.liliyayankova.unirides;
+
+import android.content.Intent;
+import android.support.annotation.NonNull;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.AuthResult;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+
+public class User_Register extends AppCompatActivity {
+    private EditText forename;
+    private EditText surname;
+    private EditText email;
+    private EditText password;
+    private EditText age;
+    private Button sign_up;
+
+    /* Used for Firebase authorisation in creating a new account */
+    private FirebaseAuth firebaseAuth;
+
+    /* Allows access to the Firebase Database */
+    private FirebaseDatabase firebaseDatabase;
+
+    /* Used to add values to the database */
+    private DatabaseReference dbReference;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_user_register);
+        this.forename = (EditText) findViewById(R.id.forename);
+        this.surname = (EditText) findViewById(R.id.surname);
+        this.email = (EditText) findViewById(R.id.email);
+        this.password = (EditText) findViewById(R.id.password);
+        this.age = (EditText) findViewById(R.id.age);
+        this.sign_up = (Button) findViewById(R.id.signup_button);
+
+        this.firebaseAuth = FirebaseAuth.getInstance();
+        this.firebaseDatabase = FirebaseDatabase.getInstance();
+        this.dbReference = firebaseDatabase.getReference();
+
+        //sign_up button listener
+        sign_up.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                //execute register method
+                registerClick(view);
+            }
+        });
+
+
+    }
+
+    public void registerClick(View v) {
+        final String forenameText = forename.getText().toString().trim();
+        final String surnameText = surname.getText().toString().trim();
+        final String emailText = email.getText().toString().trim();
+        final String passwordText = password.getText().toString().trim();
+        final String ageText = age.getText().toString().trim();
+
+        Log.d("Email", emailText);
+        Log.d("Password", passwordText);
+
+        if(TextUtils.isEmpty(forenameText) || TextUtils.isEmpty(surnameText)
+        || TextUtils.isEmpty(emailText) || TextUtils.isEmpty(passwordText)
+        || TextUtils.isEmpty(passwordText) || TextUtils.isEmpty(ageText)) {
+            Toast.makeText(this, "One of the fields is empty!",Toast.LENGTH_SHORT).show();
+
+        }
+
+        else {
+            firebaseAuth.createUserWithEmailAndPassword(emailText, passwordText)
+                    .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
+                        @Override
+                        public void onComplete(@NonNull Task<AuthResult> task) {
+                            if(task.isSuccessful()) {
+                                FirebaseUser user = firebaseAuth.getCurrentUser();
+                                String userId = user.getUid();
+                                Toast.makeText(User_Register.this, forenameText,Toast.LENGTH_SHORT).show();
+
+                                // Code to add values into the database
+                                // Only temporary for now, might change these a bit later
+                                dbReference.child("passengers").child(userId).child("first_name").setValue(forenameText);
+                                dbReference.child("passengers").child(userId).child("last_name").setValue(surnameText);
+                                dbReference.child("passengers").child(userId).child("age").setValue(ageText);
+                                dbReference.child("passengers").child(userId).child("email").setValue(emailText);
+                                dbReference.child("passengers").child(userId).child("average_rating").setValue(0.0);
+
+
+                                //finish();
+                                Toast.makeText(User_Register.this, "registration successful",Toast.LENGTH_SHORT).show();
+                                Intent home = new Intent(User_Register.this, Homepage.class);
+                                startActivity(home);
+
+                            }
+                            else {
+                                Toast.makeText(User_Register.this, "registration not successful",Toast.LENGTH_SHORT).show();
+                            }
+                        }
+                    });
+        }
+
+    }
+
+}
diff --git a/src/main/res/layout/activity_driver_main.xml b/src/main/res/layout/activity_driver_main.xml
new file mode 100644
index 0000000000000000000000000000000000000000..77d46787a05cdebfc12e7acf0a284babb1de2070
--- /dev/null
+++ b/src/main/res/layout/activity_driver_main.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/common_google_signin_btn_text_dark_pressed"
+    android:orientation="vertical"
+    tools:context=".User_Main">
+
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/user_toolbar" />
+
+    <ImageView
+        android:id="@+id/app_logo_image"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:contentDescription="@string/app_name"
+        app:srcCompat="@drawable/logo_hd" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="2"
+        android:orientation="horizontal">
+
+        <ImageButton
+            android:id="@+id/view_route_button"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="30dp"
+            android:layout_weight="1"
+            android:background="@color/common_google_signin_btn_text_dark_disabled"
+            android:contentDescription="@string/view_routes"
+            android:scaleType="fitCenter"
+            android:src="@drawable/icon_map"
+            android:text="@string/title_activity_map" />
+
+        <ImageButton
+            android:id="@+id/create_route_button"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="30dp"
+            android:layout_weight="1"
+            android:background="@color/common_google_signin_btn_text_dark_disabled"
+            android:contentDescription="@string/create_route"
+            android:scaleType="fitCenter"
+            android:src="@drawable/icon_plus"
+            android:text="@string/title_activity_map" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:layout_weight="0"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/view_route_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@string/view_routes"
+            android:textAllCaps="false"
+            android:textSize="30sp" />
+
+        <TextView
+            android:id="@+id/create_route_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@string/create_route"
+            android:textAllCaps="false"
+            android:textSize="30sp" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_driver_register.xml b/src/main/res/layout/activity_driver_register.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4c0c21b56bc53853895f756b00ee8f4af46575cc
--- /dev/null
+++ b/src/main/res/layout/activity_driver_register.xml
@@ -0,0 +1,129 @@
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="10dp">
+
+    <TextView
+        android:id="@+id/driver_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="50dp"
+        android:text="@string/driver_register"
+        android:textSize="30sp"
+        android:textStyle="bold" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <EditText
+            android:id="@+id/forename"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/name"
+            android:inputType="text" />
+
+        <EditText
+            android:id="@+id/surname"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/lastname"
+            android:inputType="text" />
+
+        <EditText
+            android:id="@+id/email"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/prompt_email"
+            android:inputType="textEmailAddress" />
+
+        <EditText
+            android:id="@+id/password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/prompt_password"
+            android:inputType="textPassword" />
+
+        <EditText
+            android:id="@+id/age"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/prompt_age"
+            android:inputType="number" />
+
+        <EditText
+            android:id="@+id/car_model"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/car_model"
+            android:inputType="text" />
+
+        <EditText
+            android:id="@+id/license_plate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/licence_plate"
+            android:inputType="text" />
+
+        <EditText
+            android:id="@+id/time_driving"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/time_driving"
+            android:inputType="text" />
+
+        <!-- Potentially temporary -->
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="2"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tickbox_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:text="@string/tickbox_text"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <CheckBox
+            android:id="@+id/checkBox_student"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/student_confirmation" />
+
+        <CheckBox
+            android:id="@+id/checkBox_TandC"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/terms_and_conditions" />
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/signup_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="100dp"
+        android:background="@color/colorPrimaryDark"
+        android:text="@string/sign"
+        android:textColor="#FFFFFF" />
+
+
+</LinearLayout>
+
+
+
diff --git a/src/main/res/layout/activity_homepage.xml b/src/main/res/layout/activity_homepage.xml
index e7bc7a4f1a7e44698e931c79757da55eb94c5060..3c230c0fb83152694b2b94ebf0cdccf84cf09617 100644
--- a/src/main/res/layout/activity_homepage.xml
+++ b/src/main/res/layout/activity_homepage.xml
@@ -16,9 +16,9 @@
 
     <ImageView
         android:id="@+id/imageView4"
-        android:layout_width="400dp"
-        android:layout_height="400dp"
-        android:layout_weight="0"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
         android:contentDescription="@string/app_logo"
         android:src="@drawable/logo_hd"
         tools:layout_editor_absoluteX="24dp"
@@ -27,24 +27,24 @@
     <TextView
         android:id="@+id/welcome"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="2"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:text="@string/welcome"
         android:textAlignment="center"
         android:textAllCaps="true"
         android:textColor="@color/colorPrimary"
+        android:textSize="24sp"
         android:textStyle="bold|italic" />
 
     <TextView
         android:id="@+id/subh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="2"
+        android:layout_height="wrap_content"
         android:gravity="top"
         android:text="@string/subheading"
         android:textAlignment="center"
         android:textColor="@color/colorPrimary"
+        android:textSize="18sp"
         android:textStyle="italic" />
 
     <LinearLayout
@@ -57,10 +57,13 @@
         <Button
             android:id="@+id/loginB"
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="50dp"
+            android:layout_marginTop="70dp"
+            android:layout_marginEnd="25dp"
+            android:layout_marginBottom="50dp"
+            android:layout_weight="1"
             android:background="@color/colorPrimary"
             android:text="@string/login"
             android:textAllCaps="false"
@@ -70,10 +73,13 @@
         <Button
             android:id="@+id/registerB"
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="70dp"
+            android:layout_marginEnd="50dp"
+            android:layout_marginBottom="50dp"
+            android:layout_weight="1"
             android:background="@color/colorPrimaryDark"
             android:text="@string/register"
             android:textAllCaps="false"
diff --git a/src/main/res/layout/activity_login.xml b/src/main/res/layout/activity_login.xml
index c14178ea29d9b38dac77d0cee350f033a67ffab8..d6c8087c2edec6488d97cd02acae2a4a9c9d32d7 100644
--- a/src/main/res/layout/activity_login.xml
+++ b/src/main/res/layout/activity_login.xml
@@ -24,7 +24,7 @@
         android:id="@+id/login_form"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="0"
+        android:layout_weight="1"
         android:foregroundGravity="center">
 
         <LinearLayout
@@ -46,7 +46,7 @@
                     android:inputType="textEmailAddress"
                     android:maxLines="1"
                     android:singleLine="true"
-                    android:text="user@surrey.ac.uk" />
+                    android:text="driv3r@surrey.ac.uk" />
 
             </android.support.design.widget.TextInputLayout>
 
@@ -65,7 +65,7 @@
                     android:inputType="textPassword"
                     android:maxLines="1"
                     android:singleLine="true"
-                    android:text="password" />
+                    android:text="qwerty" />
 
             </android.support.design.widget.TextInputLayout>
 
@@ -82,4 +82,26 @@
 
         </LinearLayout>
     </ScrollView>
+
+    <TextView
+        android:id="@+id/hint_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Easy Logins for Testing (will be removed later!)"
+        android:textSize="24sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/hint_for_tests"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Passenger: Username = passenger@surrey.ac.uk, password = password"
+        android:textSize="24sp" />
+
+    <TextView
+        android:id="@+id/hint_for_tests2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Driver: Username = driv3r@surrey.ac.uk, password = qwerty"
+        android:textSize="24sp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_map.xml b/src/main/res/layout/activity_map.xml
index 3ee874c14b6eb2f5f7dc4daddac0060571862026..1e48ff9697cd6f7a6bf89f454116942dde7900a4 100644
--- a/src/main/res/layout/activity_map.xml
+++ b/src/main/res/layout/activity_map.xml
@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    tools:context=".Map">
+
+    <include
+    android:id="@+id/toolbar"
+    layout="@layout/user_toolbar" />
+
+    <fragment
     android:id="@+id/map"
     android:name="com.google.android.gms.maps.SupportMapFragment"
     android:layout_width="match_parent"
@@ -10,5 +20,4 @@
 
 
 
-
-
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_profile.xml b/src/main/res/layout/activity_profile.xml
index 65c11cb653b99b2f4d2b248098064606116dc59d..c35e6f63a0b3b569a24cf9f3660990cd2d43f2a7 100644
--- a/src/main/res/layout/activity_profile.xml
+++ b/src/main/res/layout/activity_profile.xml
@@ -9,7 +9,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/user_toolbar" />
 
     <TextView
         android:id="@+id/profile_text"
diff --git a/src/main/res/layout/activity_register.xml b/src/main/res/layout/activity_register.xml
index 19705ba7fe8a84526516164c63dbf425c2cc6bb6..7dfedb11734c0a1a5a9b7f154de40598f602a00c 100644
--- a/src/main/res/layout/activity_register.xml
+++ b/src/main/res/layout/activity_register.xml
@@ -1,104 +1,60 @@
-
+<?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="10dp">
+    tools:context=".Register">
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/title_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="2"
+        android:layout_weight="1"
         android:gravity="center"
-        android:orientation="vertical">
-
-        <EditText
-            android:id="@+id/forename"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/name"
-            android:inputType="text" />
-
-        <EditText
-            android:id="@+id/surname"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/lastname"
-            android:inputType="text" />
-
-        <EditText
-            android:id="@+id/email"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/prompt_email"
-            android:inputType="textEmailAddress" />
-
-        <EditText
-            android:id="@+id/password"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/prompt_password"
-            android:inputType="textPassword"
-            />
-
-        <EditText
-            android:id="@+id/age"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/prompt_age"
-            android:inputType="number" />
-        <CheckBox
-            android:id="@+id/checkBox_driver"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/driver_checkbox" /> <!-- Potentially temporary -->
+        android:text="@string/register"
+        android:textAllCaps="false"
+        android:textStyle="bold"
+        android:textSize="30sp" />
 
-    </LinearLayout>
+    <TextView
+        android:id="@+id/info_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        android:layout_weight="0.5"
+        android:text="@string/register_info"
+        android:textAlignment="center"
+        android:textSize="18sp" />
 
-    <LinearLayout
+    <Button
+        android:id="@+id/user_signup"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_margin="20dp"
         android:layout_weight="1"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/tickbox_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:text="@string/tickbox_text"
-            android:textSize="14sp"
-            android:textStyle="bold" />
-
-        <CheckBox
-            android:id="@+id/checkBox_student"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/student_confirmation" />
-
-        <CheckBox
-            android:id="@+id/checkBox_TandC"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/terms_and_conditions" />
-
-    </LinearLayout>
+        android:background="@color/colorPrimary"
+        android:gravity="center"
+        android:text="@string/user_register"
+        android:textAllCaps="true"
+        android:textColor="@color/ic_launcher_background"
+        android:textStyle="bold" />
 
     <Button
-        android:id="@+id/signup"
-        android:layout_width="wrap_content"
+        android:id="@+id/driver_signup"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginBottom="100dp"
-        android:background="@color/colorPrimary"
-        android:onClick="registerClick"
-        android:text="@string/sign"
+        android:layout_gravity="center_vertical"
+        android:layout_margin="20dp"
+        android:layout_weight="1"
+        android:background="@color/colorPrimaryDark"
+        android:gravity="center"
+        android:text="@string/driver_register"
         android:textAllCaps="true"
         android:textColor="@color/ic_launcher_background"
         android:textStyle="bold" />
 
 
 </LinearLayout>
-
-
-
diff --git a/src/main/res/layout/activity_route.xml b/src/main/res/layout/activity_route.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9bfa69c17399f4da93a03e33de6b9f3376b8f92e
--- /dev/null
+++ b/src/main/res/layout/activity_route.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".Settings">
+
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/user_toolbar" />
+
+    <TextView
+        android:id="@+id/create_route_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        android:gravity="center"
+        android:text="@string/create_route"
+        android:textSize="30sp" />
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_settings.xml b/src/main/res/layout/activity_settings.xml
index d7af5fa076b7818646f2ad9f0adcad949428ff5b..8c32defa6d77eb8b0d06b7f06c82a520079283ac 100644
--- a/src/main/res/layout/activity_settings.xml
+++ b/src/main/res/layout/activity_settings.xml
@@ -9,7 +9,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/user_toolbar" />
 
     <TextView
         android:id="@+id/settings_text"
diff --git a/src/main/res/layout/activity_main.xml b/src/main/res/layout/activity_user_main.xml
similarity index 87%
rename from src/main/res/layout/activity_main.xml
rename to src/main/res/layout/activity_user_main.xml
index 971df9b4c9637ee4dab9952a9b2e225be78dc9f7..e70cdb326e124921d7ec1aaac8a1af5bf14a5cf7 100644
--- a/src/main/res/layout/activity_main.xml
+++ b/src/main/res/layout/activity_user_main.xml
@@ -6,11 +6,11 @@
     android:layout_height="match_parent"
     android:background="@color/common_google_signin_btn_text_dark_pressed"
     android:orientation="vertical"
-    tools:context=".Main">
+    tools:context=".User_Main">
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/user_toolbar" />
 
     <ImageView
         android:id="@+id/app_logo_image"
@@ -27,14 +27,14 @@
         android:orientation="horizontal">
 
         <ImageButton
-            android:id="@+id/mapview_button"
+            android:id="@+id/view_route_button"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
             android:background="@color/common_google_signin_btn_text_dark_disabled"
-            android:contentDescription="@string/routes"
+            android:contentDescription="@string/view_routes"
             android:scaleType="fitCenter"
             android:src="@drawable/icon_map"
             android:text="@string/title_activity_map" />
@@ -48,11 +48,11 @@
         android:orientation="horizontal">
 
         <TextView
-            android:id="@+id/map_text"
+            android:id="@+id/view_route_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="@string/routes"
+            android:text="@string/view_routes"
             android:textAllCaps="false"
             android:textSize="30sp" />
 
diff --git a/src/main/res/layout/activity_user_register.xml b/src/main/res/layout/activity_user_register.xml
new file mode 100644
index 0000000000000000000000000000000000000000..826e1566778f8fe25e2d1e2817ab098eb4c8128f
--- /dev/null
+++ b/src/main/res/layout/activity_user_register.xml
@@ -0,0 +1,108 @@
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="10dp">
+
+    <TextView
+        android:id="@+id/user_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="50dp"
+        android:text="@string/user_register"
+        android:textSize="30sp"
+        android:textStyle="bold" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1.2"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <EditText
+            android:id="@+id/forename"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/name"
+            android:inputType="text" />
+
+        <EditText
+            android:id="@+id/surname"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/lastname"
+            android:inputType="text" />
+
+        <EditText
+            android:id="@+id/email"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/prompt_email"
+            android:inputType="textEmailAddress" />
+
+        <EditText
+            android:id="@+id/password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/prompt_password"
+            android:inputType="textPassword" />
+
+        <EditText
+            android:id="@+id/age"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/prompt_age"
+            android:inputType="number" />
+
+        <!-- Potentially temporary -->
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="2"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tickbox_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:text="@string/tickbox_text"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <CheckBox
+            android:id="@+id/checkBox_student"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/student_confirmation" />
+
+        <CheckBox
+            android:id="@+id/checkBox_TandC"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/terms_and_conditions" />
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/signup_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="100dp"
+        android:background="@color/colorPrimary"
+        android:text="@string/sign"
+        android:textColor="#FFFFFF" />
+
+
+</LinearLayout>
+
+
+
diff --git a/src/main/res/layout/toolbar.xml b/src/main/res/layout/user_toolbar.xml
similarity index 93%
rename from src/main/res/layout/toolbar.xml
rename to src/main/res/layout/user_toolbar.xml
index 42ffab24581b5f6d406701b9f2e288c5674262e1..48fabe1c6b7abff7e81805c0ff56ce5f6f7a77d5 100644
--- a/src/main/res/layout/toolbar.xml
+++ b/src/main/res/layout/user_toolbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/toolbar"
+    android:id="@+id/driver_toolbar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:alpha="1"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index dfb93fc5b0e348fa980fab7059cdcaacf7bfc39e..6bfbda3331bd2265180ec89339f65bd63eae8148 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -6,9 +6,22 @@
     <string name="login">Log in</string>
     <string name="logout">Log out</string>
     <string name="register">Register</string>
+    <!-- TODO: remove/refine the register information for choosing between passenger & driver account -->
+    <string name="register_info">
+        "Choose whether you would like to sign up to UniRides as a Driver user or a Passenger user.\n
+        A driver user can do anything a passenger can do on the app (such as: viewing routes, getting lifts
+        from other drivers, and reviewing other users) but with the added privileges to setup your own
+        custom driver routes and post them for other passengers/drivers to see.\n
+        If you are going to become a driver for UniRides, first of all THANK YOU!\n
+        Secondly, be sure to have your car details (model, licence plate, etc.) as well as your drivers licence
+        and pictures of you and the car at the ready!"
+    </string>
+    <!-- TODO: add the terms and conditions in as a string! -->
+    <string name="user_register">User</string>
+    <string name="driver_register">Driver</string>
     <string name="title_activity_login">Sign in</string>
 
-    <!-- Strings related to login -->
+    <!-- Strings related to register/login -->
     <string name="prompt_email">Email</string>
     <string name="prompt_password">Password</string>
     <string name="action_sign_in">Log in</string>
@@ -26,14 +39,17 @@
     <string name="sign">Sign up</string>
     <string name="app_logo">App Logo</string>
     <string name="tickbox_text">Tick the appropriate boxes:</string>
-    <string name="driver_checkbox">I am a driver</string> <!-- potentially temporary -->
     <string name="student_confirmation">I am a university student or professor</string>
     <string name="terms_and_conditions">I agree with UniRides Terms and Conditions</string>
+    <string name="licence_plate">Licence Plate</string>
+    <string name="car_model">Car Model</string>
+    <string name="time_driving">Time Driving</string>
 
     <!-- main/map activity strings -->
     <string name="home">Home</string>
     <string name="title_activity_map">Map</string>
-    <string name="routes">Routes</string>
+    <string name="view_routes">View Routes</string>
+    <string name="create_route">Create New Route</string>
     <string name="settings">Settings</string>
     <string name="profile">Profile</string>
 
diff --git a/unirides.iml b/unirides.iml
new file mode 100644
index 0000000000000000000000000000000000000000..08e5e63906d5415c77dcf25ed3ad80e51c33d6cb
--- /dev/null
+++ b/unirides.iml
@@ -0,0 +1,196 @@
+<?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">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
+        <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/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <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/duplicate_classes_check" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
+      <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" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <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/tmp" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: com.android.support:design:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier:16.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-sdk:16.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:loader:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:1.0.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:cursoradapter:28.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-sdk-api:16.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-auth:16.2.1@aar" level="project" />
+    <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" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-maps:16.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-flags:16.0.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:16.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-core:16.0.8@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar" level="project" />
+    <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" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-analytics:16.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-v4:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-database:16.1.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-auth-interop:16.0.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement:16.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-interop:16.0.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-impl:16.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-stats:16.0.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:16.0.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-common:16.1.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-measurement-connector:17.0.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value-annotations:1.6@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:16.0.1@aar" level="project" />
+  </component>
+</module>
\ No newline at end of file