diff --git a/.gradle/2.14.1/taskArtifacts/cache.properties.lock b/.gradle/2.14.1/taskArtifacts/cache.properties.lock
index 9cb326e..4bc36bc 100644
Binary files a/.gradle/2.14.1/taskArtifacts/cache.properties.lock and b/.gradle/2.14.1/taskArtifacts/cache.properties.lock differ
diff --git a/.gradle/2.14.1/taskArtifacts/fileHashes.bin b/.gradle/2.14.1/taskArtifacts/fileHashes.bin
index 2743bfe..5ab4d39 100644
Binary files a/.gradle/2.14.1/taskArtifacts/fileHashes.bin and b/.gradle/2.14.1/taskArtifacts/fileHashes.bin differ
diff --git a/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin
index 0c89530..a3b51c0 100644
Binary files a/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin and b/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin differ
diff --git a/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin b/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin
index 0eb204e..59c691c 100644
Binary files a/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin and b/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin differ
diff --git a/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin b/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin
index a5fa821..07834ea 100644
Binary files a/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin and b/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin differ
diff --git a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
index 39c0867..8070bed 100644
Binary files a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin and b/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin differ
diff --git a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index dfbed68..8342c89 100644
Binary files a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
index 3f5f227..b1081db 100644
Binary files a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and b/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin differ
diff --git a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index d626cfc..2cc6197 100644
Binary files a/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d89cffa..df29872 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
@@ -10,17 +7,32 @@
       </MavenGeneralSettings>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="5">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index edc59d9..174a2b2 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$/.idea/modules/PartkeeprScannrApp.iml" filepath="$PROJECT_DIR$/.idea/modules/PartkeeprScannrApp.iml" />
+      <module fileurl="file://$PROJECT_DIR$/Scannr-v2.iml" filepath="$PROJECT_DIR$/Scannr-v2.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/app.iml" />
     </modules>
   </component>
diff --git a/.idea/modules/PartkeeprScannrApp.iml b/.idea/modules/PartkeeprScannrApp.iml
deleted file mode 100644
index 08c8b33..0000000
--- a/.idea/modules/PartkeeprScannrApp.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="PartkeeprScannrApp" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_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>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../..">
-      <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/app/app.iml b/.idea/modules/app/app.iml
index 47f5b7a..4526286 100644
--- a/.idea/modules/app/app.iml
+++ b/.idea/modules/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="PartkeeprScannrApp" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$/../../../app" 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>
@@ -9,7 +9,6 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
@@ -23,7 +22,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/../../../app/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/classes/test/debug" />
     <exclude-output />
@@ -45,39 +44,38 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/dependency-cache" />
@@ -90,17 +88,12 @@
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.journeyapps/zxing-android-embedded/3.4.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/exploded-aar/com.squareup.leakcanary/leakcanary-android/1.3.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/incremental-verifier" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build/intermediates/symbols" />
@@ -110,20 +103,20 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="haha-1.3" level="project" />
-    <orderEntry type="library" exported="" name="design-23.4.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
-    <orderEntry type="library" exported="" name="zxing-android-embedded-3.4.0" level="project" />
-    <orderEntry type="library" exported="" name="core-3.2.1" level="project" />
-    <orderEntry type="library" exported="" name="leakcanary-android-1.3.1" level="project" />
-    <orderEntry type="library" exported="" name="leakcanary-watcher-1.3.1" level="project" />
-    <orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
-    <orderEntry type="library" exported="" name="leakcanary-analyzer-1.3.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
-    <orderEntry type="library" exported="" name="recyclerview-v7-23.4.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
-    <orderEntry type="library" exported="" name="support-vector-drawable-23.4.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.squareup.leakcanary:leakcanary-analyzer:1.3.1@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.journeyapps:zxing-android-embedded-3.4.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.google.zxing:core:3.2.1@jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:appcompat-v7-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.squareup.haha:haha:1.3@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.squareup.leakcanary:leakcanary-android-1.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.squareup.leakcanary:leakcanary-watcher:1.3.1@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:design-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:animated-vector-drawable-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-v4-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-annotations:23.4.0@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:recyclerview-v7-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-vector-drawable-23.4.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/src/main/java/com/drobisch/partkeeprscannrapp/MainActivity.java b/app/src/main/java/com/drobisch/partkeeprscannrapp/MainActivity.java
index 4a23a40..5c45def 100644
--- a/app/src/main/java/com/drobisch/partkeeprscannrapp/MainActivity.java
+++ b/app/src/main/java/com/drobisch/partkeeprscannrapp/MainActivity.java
@@ -105,9 +105,10 @@ public void onClick(View view) {
         mLoginFormView = findViewById(R.id.login_form);
         mProgressView = findViewById(R.id.login_progress);
 
-        SharedPreferences.Editor editor = getSharedPreferences(getString(R.string.pref_name), MODE_PRIVATE).edit();
-        editor.clear();
-        editor.commit();
+        //The lines below clear the previously saved shared preferences
+        //SharedPreferences.Editor editor = getSharedPreferences(getString(R.string.pref_name), MODE_PRIVATE).edit();
+        //editor.clear();
+        //editor.commit();
 
         SharedPreferences prefs = getSharedPreferences(getString(R.string.pref_name), MODE_PRIVATE);
         String user = prefs.getString(getString(R.string.pref_key_user), getString(R.string.pref_default_user));
diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
index c0518d2..d3e2508 100644
--- a/build/intermediates/dex-cache/cache.xml
+++ b/build/intermediates/dex-cache/cache.xml
@@ -2,102 +2,102 @@
 <items version="2" >
 
     <item
-        jar="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.4.0\jars\classes.jar"
+        jar="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/exploded-aar/com.android.support/design/23.4.0/jars/classes.jar"
         jumboMode="false"
         revision="23.0.3"
-        sha1="67bd36ee9340ec7c254108936ad16b24bed160cc">
-        <dex dex="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\pre-dexed\debug\com.android.support-support-v4-23.4.0_f1a01ed598e8cceaac0b9e91aa74d7bc48ad2ccf.jar" />
+        sha1="5326d9a850d491714fef8cbfaa9ea3416f0bf0d2">
+        <dex dex="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/pre-dexed/debug/com.android.support-design-23.4.0_49170ec66692501babe5bcdf83565b7f8e357175.jar" />
     </item>
     <item
-        jar="E:\Android\android-sdk\extras\android\m2repository\com\android\support\support-annotations\23.4.0\support-annotations-23.4.0.jar"
+        jar="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars/libs/internal_impl-23.4.0.jar"
         jumboMode="false"
         revision="23.0.3"
-        sha1="ffbe55fdb2bb456b1485831706a9eac3300bb6b8">
-        <dex dex="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\pre-dexed\debug\support-annotations-23.4.0_e418e7189f88f8ca2dfc1a12eb3076c5608e9ab8.jar" />
+        sha1="ea3c07504d2c8f4b13aa17c45c1b68ed9c1c3674">
+        <dex dex="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/pre-dexed/debug/internal_impl-23.4.0_6d75bbbafcec46a17d1898409ce456f94b58de60.jar" />
     </item>
     <item
-        jar="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\23.4.0\jars\classes.jar"
+        jar="/home/gilham/.gradle/caches/modules-2/files-2.1/com.google.zxing/core/3.2.1/2287494d4f5f9f3a9a2bb6980e3f32053721b315/core-3.2.1.jar"
         jumboMode="false"
         revision="23.0.3"
-        sha1="548f06de403a9409f00554b3ee12a9fdea0e236c">
-        <dex dex="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\pre-dexed\debug\com.android.support-appcompat-v7-23.4.0_5c525e6a43fd9d7cb33a9ca90fede049585d8961.jar" />
+        sha1="2287494d4f5f9f3a9a2bb6980e3f32053721b315">
+        <dex dex="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/pre-dexed/debug/core-3.2.1_42304728e2efe79074f1d9e5010feae073c747bf.jar" />
     </item>
     <item
-        jar="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\exploded-aar\com.android.support\recyclerview-v7\23.4.0\jars\classes.jar"
+        jar="/home/gilham/Android/Sdk/extras/android/m2repository/com/android/support/support-annotations/23.4.0/support-annotations-23.4.0.jar"
         jumboMode="false"
         revision="23.0.3"
-        sha1="ec75036c3c52e451d0cde50a5aedaf5fd32354a0">
-        <dex dex="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\pre-dexed\debug\com.android.support-recyclerview-v7-23.4.0_46179b8972101db8a3aa25e298422ac1d5ec1fcf.jar" />
+        sha1="ffbe55fdb2bb456b1485831706a9eac3300bb6b8">
+        <dex dex="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/pre-dexed/debug/support-annotations-23.4.0_f4d200301b26275722ba42e6f7965870f16c37a9.jar" />
     </item>
     <item
-        jar="C:\Users\drobisch\.gradle\caches\modules-2\files-2.1\com.google.zxing\core\3.2.1\2287494d4f5f9f3a9a2bb6980e3f32053721b315\core-3.2.1.jar"
+        jar="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars/classes.jar"
         jumboMode="false"
         revision="23.0.3"
-        sha1="2287494d4f5f9f3a9a2bb6980e3f32053721b315">
-        <dex dex="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\pre-dexed\debug\core-3.2.1_ef7b3557e04d992b0bf0b6cc0a406732b073ca4d.jar" />
+        sha1="de4db3785756bfb0915a9f59a9b3f2fea7407be4">
+        <dex dex="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/pre-dexed/debug/com.android.support-animated-vector-drawable-23.4.0_18a8f4d7e4ed5b1425a3698ed0a7af1010f6890e.jar" />
     </item>
     <item
-        jar="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\exploded-aar\com.android.support\animated-vector-drawable\23.4.0\jars\classes.jar"
+        jar="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/jars/classes.jar"
         jumboMode="false"
         revision="23.0.3"
-        sha1="de4db3785756bfb0915a9f59a9b3f2fea7407be4">
-        <dex dex="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\pre-dexed\debug\com.android.support-animated-vector-drawable-23.4.0_09e86570126c05c34510a0e15fb19c9821149572.jar" />
+        sha1="ec75036c3c52e451d0cde50a5aedaf5fd32354a0">
+        <dex dex="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/pre-dexed/debug/com.android.support-recyclerview-v7-23.4.0_4cf90c5238ed024d71051ea75fdda82c6967d1d1.jar" />
     </item>
     <item
-        jar="C:\Users\drobisch\.gradle\caches\modules-2\files-2.1\com.squareup.leakcanary\leakcanary-watcher\1.3.1\6904771474c058abfc5912c13d12b02754712165\leakcanary-watcher-1.3.1.jar"
+        jar="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/exploded-aar/com.journeyapps/zxing-android-embedded/3.4.0/jars/classes.jar"
         jumboMode="false"
         revision="23.0.3"
-        sha1="6904771474c058abfc5912c13d12b02754712165">
-        <dex dex="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\pre-dexed\debug\leakcanary-watcher-1.3.1_862e94f2137beed16550b4e9f8761f6fdb581ed9.jar" />
+        sha1="0e1f104cf60bfe34147ef670229f2635789c79a4">
+        <dex dex="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/pre-dexed/debug/com.journeyapps-zxing-android-embedded-3.4.0_de3ef783f596c6bc657f88b937b0512445ad4cb2.jar" />
     </item>
     <item
-        jar="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\exploded-aar\com.squareup.leakcanary\leakcanary-android\1.3.1\jars\classes.jar"
+        jar="/home/gilham/.gradle/caches/modules-2/files-2.1/com.squareup.leakcanary/leakcanary-analyzer/1.3.1/325e7401a7ea16918eb39ba8baad8fd5561a55d3/leakcanary-analyzer-1.3.1.jar"
         jumboMode="false"
         revision="23.0.3"
-        sha1="9066b6d4e2536b49e3b58aa301fd925247032df0">
-        <dex dex="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\pre-dexed\debug\com.squareup.leakcanary-leakcanary-android-1.3.1_10fcf356bd4b4449bf698899c631cdfd41e6cd09.jar" />
+        sha1="325e7401a7ea16918eb39ba8baad8fd5561a55d3">
+        <dex dex="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/pre-dexed/debug/leakcanary-analyzer-1.3.1_b55316bb769cc507f4939c8b7e080d9fb0266c5b.jar" />
     </item>
     <item
-        jar="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\exploded-aar\com.journeyapps\zxing-android-embedded\3.4.0\jars\classes.jar"
+        jar="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars/classes.jar"
         jumboMode="false"
         revision="23.0.3"
-        sha1="0e1f104cf60bfe34147ef670229f2635789c79a4">
-        <dex dex="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\pre-dexed\debug\com.journeyapps-zxing-android-embedded-3.4.0_3d8b479ea0d32a797f981a6bd11e0d95699dd588.jar" />
+        sha1="548f06de403a9409f00554b3ee12a9fdea0e236c">
+        <dex dex="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/pre-dexed/debug/com.android.support-appcompat-v7-23.4.0_4d6e2cb7aac9e0c8f9a0242ad3051ea312af6a24.jar" />
     </item>
     <item
-        jar="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\exploded-aar\com.android.support\design\23.4.0\jars\classes.jar"
+        jar="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/exploded-aar/com.squareup.leakcanary/leakcanary-android/1.3.1/jars/classes.jar"
         jumboMode="false"
         revision="23.0.3"
-        sha1="5326d9a850d491714fef8cbfaa9ea3416f0bf0d2">
-        <dex dex="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\pre-dexed\debug\com.android.support-design-23.4.0_2762f6a3b008b5378f273f401222fc8e6cdb2b2b.jar" />
+        sha1="9066b6d4e2536b49e3b58aa301fd925247032df0">
+        <dex dex="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/pre-dexed/debug/com.squareup.leakcanary-leakcanary-android-1.3.1_88c48ffdf13ce1d928b269c71656add81fe1271d.jar" />
     </item>
     <item
-        jar="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.4.0\jars\libs\internal_impl-23.4.0.jar"
+        jar="/home/gilham/.gradle/caches/modules-2/files-2.1/com.squareup.leakcanary/leakcanary-watcher/1.3.1/6904771474c058abfc5912c13d12b02754712165/leakcanary-watcher-1.3.1.jar"
         jumboMode="false"
         revision="23.0.3"
-        sha1="ea3c07504d2c8f4b13aa17c45c1b68ed9c1c3674">
-        <dex dex="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\pre-dexed\debug\internal_impl-23.4.0_d747a5610344923baf73c70dafb0c4bd5f5b059e.jar" />
+        sha1="6904771474c058abfc5912c13d12b02754712165">
+        <dex dex="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/pre-dexed/debug/leakcanary-watcher-1.3.1_f01f69c35a43b9a3e8839b0d9b1ac022aed1688d.jar" />
     </item>
     <item
-        jar="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\exploded-aar\com.android.support\support-vector-drawable\23.4.0\jars\classes.jar"
+        jar="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars/classes.jar"
         jumboMode="false"
         revision="23.0.3"
         sha1="c2c594cace5d83a3227b2b6e658ecbfd586d3ed9">
-        <dex dex="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\pre-dexed\debug\com.android.support-support-vector-drawable-23.4.0_07f6c9c14be8219de510425c301503f47e37bb4f.jar" />
+        <dex dex="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/pre-dexed/debug/com.android.support-support-vector-drawable-23.4.0_8df80de7eef445aade1892d1cab19f1c9b1f44ec.jar" />
     </item>
     <item
-        jar="C:\Users\drobisch\.gradle\caches\modules-2\files-2.1\com.squareup.leakcanary\leakcanary-analyzer\1.3.1\325e7401a7ea16918eb39ba8baad8fd5561a55d3\leakcanary-analyzer-1.3.1.jar"
+        jar="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars/classes.jar"
         jumboMode="false"
         revision="23.0.3"
-        sha1="325e7401a7ea16918eb39ba8baad8fd5561a55d3">
-        <dex dex="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\pre-dexed\debug\leakcanary-analyzer-1.3.1_77f79ba823d7444edfe15414731766aa68a05547.jar" />
+        sha1="67bd36ee9340ec7c254108936ad16b24bed160cc">
+        <dex dex="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/pre-dexed/debug/com.android.support-support-v4-23.4.0_de83f2ee1cb1a5c5372cd55e2f945439f7f49abc.jar" />
     </item>
     <item
-        jar="C:\Users\drobisch\.gradle\caches\modules-2\files-2.1\com.squareup.haha\haha\1.3\d2c832f9d14a11c79f58a7ee2e10526a12152c72\haha-1.3.jar"
+        jar="/home/gilham/.gradle/caches/modules-2/files-2.1/com.squareup.haha/haha/1.3/d2c832f9d14a11c79f58a7ee2e10526a12152c72/haha-1.3.jar"
         jumboMode="false"
         revision="23.0.3"
         sha1="d2c832f9d14a11c79f58a7ee2e10526a12152c72">
-        <dex dex="E:\Workspaces\AndroidDev\PartkeeprScannrApp\app\build\intermediates\pre-dexed\debug\haha-1.3_b0d56f4a30c5579c294eeb446dce1d85585da539.jar" />
+        <dex dex="/home/gilham/AndroidStudioProjects/Scannr-v2/app/build/intermediates/pre-dexed/debug/haha-1.3_f959a98438ba9592cf576289ff5a991c6cb965f2.jar" />
     </item>
 
 </items>
diff --git a/local.properties b/local.properties
index ae5a102..ad92795 100644
--- a/local.properties
+++ b/local.properties
@@ -1,11 +1,9 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
+## 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.
-#Sat Nov 12 15:47:05 CET 2016
-sdk.dir=E\:\\Android\\android-sdk
+#Wed Sep 26 14:36:22 SAST 2018
+ndk.dir=/home/gilham/Android/Sdk/ndk-bundle
+sdk.dir=/home/gilham/Android/Sdk