Merge branch 'develop' of http://bdgit.educoder.net/p05168729/p3p7sqtgz into develop

# Conflicts:
#	src/.gradle/6.1.1/fileHashes/fileHashes.bin
#	src/.gradle/6.1.1/fileHashes/fileHashes.lock

src/.idea/modules/app/app.iml

@@ -25,8 +25,4 @@
       </configuration>
     </facet>
   </component>
-  <component name="sonarModuleSettings">
-    <option name="localAnalysisScripName" value="&lt;PROJECT&gt;" />
-    <option name="serverName" value="&lt;PROJECT&gt;" />
-  </component>
 </module>

src/.idea/src.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+</module>

src/local.properties

@@ -2,6 +2,7 @@
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
-#
-#Sun Sep 20 00:53:25 CST 2020
-sdk.dir=F\:\\Android\\Sdk
+# For customization when using a Version Control System, please read the
+# header note.
+#Fri Oct 23 20:47:15 CST 2020
+sdk.dir=D\:\\Android\\AndroidSDK