Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	src/.idea/dataSources.local.xml
#	src/.idea/libraries/Dart_Packages.xml

src/.idea/dataSources.local.xml

@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+<<<<<<< HEAD
   <component name="dataSourceStorageLocal" created-in="IU-211.7628.21">
     <data-source name="travelguide" uuid="e282f56a-94d6-49a3-a567-05358c5c2a23">
+=======
+  <component name="dataSourceStorageLocal" created-in="IU-232.10072.27">
+    <data-source name="travelguide" uuid="b0363c3a-7ffd-47d0-b686-86b59585a7f7">
+>>>>>>> origin/master
       <database-info product="SQLite" version="3.43.0" jdbc-version="4.2" driver-name="SQLite JDBC" driver-version="3.43.0.0" dbms="SQLITE" exact-version="3.43.0" exact-driver-version="3.43">
         <identifier-quote-string>&quot;</identifier-quote-string>
       </database-info>

src/.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="FrameworkDetectionExcludesConfiguration">
     <type id="android" />

src/travelguide.iml

@@ -10,6 +10,5 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Dart SDK" level="project" />
     <orderEntry type="library" name="Flutter Plugins" level="project" />
-    <orderEntry type="library" name="Dart Packages" level="project" />
   </component>
 </module>