Merge branch 'main' of gitlab.stud.idi.ntnu.no:sarasdj/prog2900 into connect_data_to_map

droneCode/drone_controll/Mobile-SDK-Android-master/Sample Code/.gradle/buildOutputCleanup/cache.properties

+#Mon Apr 15 16:40:23 CEST 2024
+gradle.version=8.3

droneCode/drone_controll/Mobile-SDK-Android-master/Sample Code/.gradle/config.properties

+#Wed Apr 17 09:42:46 CEST 2024
+java.home=C\:\\Program Files\\Android\\Android Studio\\jbr

droneCode/drone_controll/Mobile-SDK-Android-master/Sample Code/local.properties

+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Mon Apr 15 16:32:28 CEST 2024
+sdk.dir=C\:\\Users\\hoa_2\\AppData\\Local\\Android\\Sdk