Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1002 files changed, 2352 insertions, 0 deletions

diff --git a/Software/Android_Studio/ColorCaptureTest/.gitignore b/Software/Android_Studio/ColorCaptureTest/.gitignore
new file mode 100644
index 000000000..fd45b12f0
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/.gitignore
@@ -0,0 +1,11 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches/build_file_checksums.ser
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
diff --git a/Software/Android_Studio/Tango.Core/.gitignore b/Software/Android_Studio/ColorCaptureTest/app/.gitignore
index 796b96d1c..796b96d1c 100644
--- a/Software/Android_Studio/Tango.Core/.gitignore
+++ b/Software/Android_Studio/ColorCaptureTest/app/.gitignore
diff --git a/Software/Android_Studio/ColorCaptureTest/app/CMakeLists.txt b/Software/Android_Studio/ColorCaptureTest/app/CMakeLists.txt
new file mode 100644
index 000000000..84e716286
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/CMakeLists.txt
@@ -0,0 +1,64 @@
+# For more information about using CMake with Android Studio, read the
+# documentation: https://d.android.com/studio/projects/add-native-code.html
+
+# Sets the minimum version of CMake required to build the native library.
+
+set(pathToOpenCv C:/Users/Roy/Desktop/OpenCV)
+set(pathToProject D:/Development/Tango/Software/Android_Studio/ColorCaptureTest/app)
+#set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--exclude-libs,libippicv.a -Wl,--exclude-libs,libippiw.a")
+
+cmake_minimum_required(VERSION 3.4.1)
+
+file(GLOB_RECURSE SOURCES
+        src/main/cpp/ColorCaptureLib/*.c
+        src/main/cpp/ColorCaptureLib/*.cpp
+        )
+
+list(FILTER SOURCES EXCLUDE REGEX ".*Exports.cpp$")
+
+# Creates and names a library, sets it as either STATIC
+# or SHARED, and provides the relative paths to its source code.
+# You can define multiple libraries, and CMake builds them for you.
+# Gradle automatically packages shared libraries with your APK.
+
+include_directories(${pathToOpenCv}/sdk/native/jni/include)
+include_directories(${pathToProject}/src/main/cpp/ColorCaptureLib)
+
+add_library( lib_opencv SHARED IMPORTED )
+
+set_target_properties(lib_opencv PROPERTIES IMPORTED_LOCATION ${pathToProject}/src/main/jniLibs/${ANDROID_ABI}/libopencv_java3.so)
+
+add_library(
+        color_capture_lib
+        SHARED
+        ${SOURCES})
+
+add_library( # Sets the name of the library.
+             native-lib
+
+             # Sets the library as a shared library.
+             SHARED
+
+             # Provides a relative path to your source file(s).
+             src/main/cpp/native-lib.cpp )
+
+# Searches for a specified prebuilt library and stores the path as a
+# variable. Because CMake includes system libraries in the search path by
+# default, you only need to specify the name of the public NDK library
+# you want to add. CMake verifies that the library exists before
+# completing its build.
+
+find_library( # Sets the name of the path variable.
+              log-lib
+
+              # Specifies the name of the NDK library that
+              # you want CMake to locate.
+              log )
+
+# Specifies libraries CMake should link to your target library. You
+# can link multiple libraries, such as libraries you define in this
+# build script, prebuilt third-party libraries, or system libraries.
+
+#target_link_libraries(color_capture_lib lib_opencv)
+target_link_libraries(color_capture_lib lib_opencv ${log-lib})
+target_link_libraries(native-lib lib_opencv color_capture_lib ${log-lib})
\ No newline at end of file
diff --git a/Software/Android_Studio/ColorCaptureTest/app/build.gradle b/Software/Android_Studio/ColorCaptureTest/app/build.gradle
new file mode 100644
index 000000000..d2140802c
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/build.gradle
@@ -0,0 +1,39 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 27
+    defaultConfig {
+        applicationId "com.twine.colorcapturetest"
+        minSdkVersion 22
+        targetSdkVersion 27
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        externalNativeBuild {
+            cmake {
+                cppFlags "-std=c++11 -frtti -fexceptions -fdeclspec"
+            }
+        }
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    externalNativeBuild {
+        cmake {
+
+            path "CMakeLists.txt"
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+}
diff --git a/Software/Android_Studio/ColorCaptureTest/app/proguard-rules.pro b/Software/Android_Studio/ColorCaptureTest/app/proguard-rules.pro
new file mode 100644
index 000000000..f1b424510
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/androidTest/java/com/twine/colorcapturetest/ExampleInstrumentedTest.java b/Software/Android_Studio/ColorCaptureTest/app/src/androidTest/java/com/twine/colorcapturetest/ExampleInstrumentedTest.java
new file mode 100644
index 000000000..684a8eb55
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/androidTest/java/com/twine/colorcapturetest/ExampleInstrumentedTest.java
@@ -0,0 +1,28 @@
+package com.twine.colorcapturetest;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest
+{
+    @Test
+    public void useAppContext()
+    {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.twine.colorcapturetest", appContext.getPackageName());
+    }
+}
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/AndroidManifest.xml b/Software/Android_Studio/ColorCaptureTest/app/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..32f565072
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.twine.colorcapturetest">
+
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="false"
+        android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/cpp/ColorCaptureLib/BhBlocks.cpp b/Software/Android_Studio/ColorCaptureTest/app/src/main/cpp/ColorCaptureLib/BhBlocks.cpp
new file mode 100644
index 000000000..6d2daa7be
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/cpp/ColorCaptureLib/BhBlocks.cpp
@@ -0,0 +1,196 @@
+#include "BhBlocks.h"
+#include "opencv2/core/core.hpp"
+#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/highgui/highgui.hpp"
+
+using namespace cv;
+using namespace std;
+
+void BhBlocks::setColsRowsCount(int colCount, int rowCount)
+{
+	this->colSize = -1;
+	this->rowSize = -1;
+	this->colCount = colCount;
+	this->rowCount = rowCount;
+
+}
+
+void BhBlocks::setColRowSize(float colSize, float rowSize)
+{
+	this->colCount = -1;
+	this->rowCount = -1;
+	this->colSize = colSize;
+	this->rowCount = rowCount;
+	compute();
+
+}
+
+void BhBlocks::setRect(IplImage* srcImage)
+{
+	rct = cvGetImageROI(srcImage);
+	compute();
+}
+
+void BhBlocks::setRect(const CvRect& srcRect)
+{
+	rct = srcRect;
+	compute();
+}
+
+int BhBlocks::getColCount()
+{
+	return colCount;
+}
+
+int BhBlocks::getRowCount()
+{
+	return rowCount;
+}
+
+float BhBlocks::getColSize()
+{
+	return colSize;
+}
+
+float BhBlocks::getRowSize()
+{
+	return rowSize;
+}
+BhBlocks::BhBlocks(const IplImage* srcImage, float colSize, float rowSize, int colCount, int rowCount)
+{
+	rct = cvGetImageROI(srcImage);
+	this->colCount = colCount;
+	this->rowCount = rowCount;
+	if (colSize == -1 && colSize == -1)
+		return;
+	if (rowSize == -1)
+		rowSize = colSize;
+
+	this->colSize = colSize;
+	this->rowSize = rowSize;
+	compute();
+
+}
+
+BhBlocks::BhBlocks(const Mat& srcMat, float colSize, float rowSize, int colCount, int rowCount)
+{
+	rct.x = 0;
+	rct.y = 0;
+	rct.width = srcMat.cols;
+	rct.height = srcMat.rows;
+
+	this->colCount = colCount;
+	this->rowCount = rowCount;
+	if (colSize == -1 && colSize == -1 && colCount == -1 && rowCount == -1)
+		return;
+	if (rowSize == -1)
+		rowSize = colSize;
+
+	this->colSize = colSize;
+	this->rowSize = rowSize;
+	compute();
+}
+
+BhBlocks::BhBlocks(const CvRect& srcRect, float colSize, float rowSize, int colCount, int rowCount)
+{
+	rct = srcRect;
+	this->colCount = colCount;
+	this->rowCount = rowCount;
+	if (colSize == -1 && colSize == -1)
+		return;
+	if (rowSize == -1)
+		rowSize = colSize;
+
+	this->colSize = colSize;
+	this->rowSize = rowSize;
+	compute();
+}
+
+
+
+void BhBlocks::compute()
+{
+
+
+	float cSize;
+	float rSize;
+	if (colSize != -1 && rowSize != -1)
+	{
+		colCount = int(rct.width / colSize);
+		rowCount = int(rct.height / rowSize);
+
+		cSize = (float)rct.width / colCount;
+		rSize = (float)rct.height / rowCount;
+	}
+	else if (colCount != -1 && rowCount != -1)
+	{
+		colSize = (float)rct.width / colCount;
+		rowSize = (float)rct.height / rowCount;
+		cSize = colSize;
+		rSize = rowSize;
+
+	}
+	else return;
+	rects.clear();
+	rects.resize(rowCount);
+	for (int i = 0; i < rowCount; i++)
+		rects[i].resize(colCount);
+
+	float sumCol = 0;
+
+	for (int j = 0; j < colCount; j++)
+	{
+		float newSumCol = sumCol + cSize;
+		float curColSize = int(newSumCol - int(sumCol));
+		for (int i = 0; i < rowCount; i++)
+		{
+			rects[i][j].width = curColSize;
+			rects[i][j].x = sumCol;
+		}
+		sumCol = newSumCol;
+
+	}
+
+	float sumRow = 0;
+	for (int i = 0; i < rowCount; i++)
+	{
+		float newSumRow = sumRow + rSize;
+		float curRowSize = int(newSumRow - int(sumRow));
+		for (int j = 0; j < colCount; j++)
+		{
+			rects[i][j].height = curRowSize;
+			rects[i][j].y = sumRow;
+		}
+
+		sumRow = newSumRow;
+	}
+
+}
+void BhBlocks::drawBlocks(Mat srcImage, Scalar color, int thickness)
+{
+	for (int i = 0; i < rowCount; i++)
+		for (int j = 0; j < colCount; j++)
+			rectangle(srcImage, rects[i][j], color);
+}
+
+vector<Rect> BhBlocks::getRects()
+{
+	vector<Rect> result;
+
+	for (int i = 0; i < rowCount; i++)
+		for (int j = 0; j < colCount; j++)
+			result.push_back(rects[i][j]);
+
+	return result;
+}
+
+
+void BhBlocks::displayBlocks(char* title, IplImage* srcImage, CvScalar color, int thickness)
+{
+	//IplImage* viewImg = cvCloneImage(srcImage);
+	//drawBlocks(viewImg, color, thickness);
+	//cvShowImage(title, viewImg);
+	//cvWaitKey(0);
+	//cvDestroyWindow(title);
+	//cvReleaseImage(&viewImg);
+}
\ No newline at end of file
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/cpp/ColorCaptureLib/BhBlocks.h b/Software/Android_Studio/ColorCaptureTest/app/src/main/cpp/ColorCaptureLib/BhBlocks.h
new file mode 100644
index 000000000..588e0a295
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/cpp/ColorCaptureLib/BhBlocks.h
@@ -0,0 +1,39 @@
+#include "opencv2/core/core.hpp"
+#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/highgui/highgui.hpp"
+
+#include <iostream>
+#include <math.h>
+#include <string.h>
+
+using namespace cv;
+using namespace std;
+
+class BhBlocks
+{
+private:
+	int colCount, rowCount;
+	float colSize, rowSize;
+	CvRect rct;
+	void compute();
+public:
+	vector<vector<CvRect>> rects;
+	void setColsRowsCount(int colCount, int rowCount);
+	void setColRowSize(float colSize, float rowSize);
+	void setRect(IplImage* srcImage);
+	void setRect(const CvRect& srcRect);
+	int getColCount();
+	int getRowCount();
+	float getColSize();
+	float getRowSize();
+
+	BhBlocks(const IplImage* srcImage, float colSize = -1, float rowSize = -1, int colCount = -1, int rowCount = -1);
+	BhBlocks(const Mat& srcMat, float colSize = -1, float rowSize = -1, int colCount = -1, int rowCount = -1);
+	BhBlocks(const CvRect& srcImage, float colSize = -1, float rowSize = -1, int colCount = -1, int rowCount = -1);
+
+
+	void drawBlocks(Mat srcImage, Scalar color, int thickness);
+	void displayBlocks(char* title, IplImage* srcImage, CvScalar color, int thickness);
+	vector<Rect> getRects();
+};
+
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/cpp/ColorCaptureLib/ColorCaptureLib.cpp b/Software/Android_Studio/ColorCaptureTest/app/src/main/cpp/ColorCaptureLib/ColorCaptureLib.cpp
new file mode 100644
index 000000000..e71108bcd
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/cpp/ColorCaptureLib/ColorCaptureLib.cpp
@@ -0,0 +1,784 @@
+//
+// Created by Roy on 11/6/2018.
+//
+
+#include "ColorCaptureLib.h"
+#include <android/log.h>
+
+using namespace cv;
+using namespace std;
+
+double angleOf(Point2f p1, Point2f p2);
+double lengthOf(Point2f p1, Point2f p2);
+Point2f scale_line(Point2f p1, Point2f p2, double newlength);
+
+const int DBG = 1;
+
+bool isRectChildOf(Rect rect, Rect parent)
+{
+    cv::Rect rectsIntersecion = parent & rect;
+    return (rectsIntersecion.area() == rect.area());
+}
+
+ColorCaptureLib::ColorCaptureLib()
+{
+    isInitialized = false;
+}
+
+vector<Point> ColorCaptureLib::GetQRVertices4(Mat image)
+{
+    if (!isInitialized)
+    {
+        Initialize(image);
+        isInitialized = true;
+    }
+
+    vector<Point> result;
+
+    traces = Scalar(0, 0, 0);
+    qr_raw = Mat::zeros(100, 100, CV_8UC3);
+    qr = Mat::zeros(100, 100, CV_8UC3);
+    qr_gray = Mat::zeros(100, 100, CV_8UC1);
+    qr_thres = Mat::zeros(100, 100, CV_8UC1);
+
+    cvtColor(image, gray, CV_RGB2GRAY);		// Convert Image captured from Image Input to GrayScale
+    Canny(gray, edges, 100, 200, 3);		// Apply Canny edge detection on the gray image
+
+
+    findContours(edges, contours, hierarchy, RETR_TREE, CHAIN_APPROX_SIMPLE); // Find contours with hierarchy
+
+    mark = 0;								// Reset all detected marker count for this frame
+
+    // Get Moments for all Contours and the mass centers
+    vector<Moments> mu(contours.size());
+    vector<Point2f> mc(contours.size());
+
+    for (int i = 0; i < contours.size(); i++)
+    {
+        mu[i] = moments(contours[i], false);
+        mc[i] = Point2f(mu[i].m10 / mu[i].m00, mu[i].m01 / mu[i].m00);
+    }
+
+
+    // Start processing the contour data
+
+    // Find Three repeatedly enclosed contours A,B,C
+    // NOTE: 1. Contour enclosing other contours is assumed to be the three Alignment markings of the QR code.
+    // 2. Alternately, the Ratio of areas of the "concentric" squares can also be used for identifying base Alignment markers.
+    // The below demonstrates the first method
+
+    vector<int> indeces;
+
+    bool has_f = false;
+
+    for (int i = 0; i < contours.size(); i++)
+    {
+        //Find the approximated polygon of the contour we are examining
+        approxPolyDP(contours[i], pointsseq, arcLength(contours[i], true)*0.02, true);
+        if (pointsseq.size() == 4)      // only quadrilaterals contours are examined
+        {
+            int k = i;
+            int c = 0;
+
+            while (hierarchy[k][2] != -1)
+            {
+                k = hierarchy[k][2];
+                c = c + 1;
+            }
+            if (hierarchy[k][2] != -1)
+                c = c + 1;
+
+            if (c == 5)
+            {
+                if (mark == 0)		A = i;
+                else if (mark == 1)	B = i;		// i.e., A is already found, assign current contour to B
+                else if (mark == 2)	C = i;		// i.e., A and B are already found, assign current contour to C
+                else if (mark == 3)	D = i;		// i.e., A and B are already found, assign current contour to C
+
+                indeces.push_back(i);
+
+                mark = mark + 1;
+            }
+            else if (c == 6)
+            {
+                F = i;
+                has_f = true;
+            }
+        }
+    }
+
+
+    if (mark >= 4 && has_f)		// Ensure we have (atleast 3; namely A,B,C) 'Alignment Markers' discovered
+    {
+        // We have found the 3 markers for the QR code; Now we need to determine which of them are 'top', 'right' and 'bottom' markers
+
+        // Determining the 'top' marker
+        // Vertex of the triangle NOT involved in the longest side is the 'outlier'
+
+
+
+        int minIndex = A;
+
+        __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n Mark count is %d \n", mark);
+        __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n Indices count is %d \n", (int)indeces.size());
+        __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n contours count is %d \n", (int)contours.size());
+        __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n minIndex is %d \n", minIndex);
+
+        for (size_t i = 0; i < indeces.size(); i++)
+        {
+            Rect rect1 = boundingRect(contours[indeces[i]]);
+
+            __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n Passed Rect 1 \n");
+
+            __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n contours[F] count is %d \n", (int)contours[F].size());
+
+            Rect rect2 = boundingRect(contours[F]);
+
+            __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n Passed Rect 2 \n");
+
+            if (isRectChildOf(rect1, rect2))
+            {
+                minIndex = indeces[i];
+                break;
+            }
+        }
+
+        __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n Passed bounding rect \n");
+
+        for (size_t i = 0; i < indeces.size(); i++)
+        {
+            if (indeces[i] == minIndex)
+            {
+                indeces.erase(indeces.begin() + i);
+                break;
+            }
+        }
+
+        __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n Passed remove indices \n");
+
+        A = indeces[0];
+        B = indeces[1];
+        C = indeces[2];
+
+        AB = cv_distance(mc[A], mc[B]);
+        BC = cv_distance(mc[B], mc[C]);
+        CA = cv_distance(mc[C], mc[A]);
+
+        __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n Passed Distance \n");
+
+        if (AB > BC && AB > CA)
+        {
+            outlier = C; median1 = A; median2 = B;
+        }
+        else if (CA > AB && CA > BC)
+        {
+            outlier = B; median1 = A; median2 = C;
+        }
+        else if (BC > AB && BC > CA)
+        {
+            outlier = A;  median1 = B; median2 = C;
+        }
+
+        top = outlier;							// The obvious choice
+
+        dist = cv_lineEquation(mc[median1], mc[median2], mc[outlier]);	// Get the Perpendicular distance of the outlier from the longest side
+        slope = cv_lineSlope(mc[median1], mc[median2], align);		// Also calculate the slope of the longest side
+
+        // Now that we have the orientation of the line formed median1 & median2 and we also have the position of the outlier w.r.t. the line
+        // Determine the 'right' and 'bottom' markers
+
+        __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n Slope \n");
+
+        if (align == 0)
+        {
+            bottom = median1;
+            right = median2;
+        }
+        else if (slope < 0 && dist < 0)		// Orientation - North
+        {
+            bottom = median1;
+            right = median2;
+            orientation = CV_QR_NORTH;
+        }
+        else if (slope > 0 && dist < 0)		// Orientation - East
+        {
+            right = median1;
+            bottom = median2;
+            orientation = CV_QR_EAST;
+        }
+        else if (slope < 0 && dist > 0)		// Orientation - South
+        {
+            right = median1;
+            bottom = median2;
+            orientation = CV_QR_SOUTH;
+        }
+
+        else if (slope > 0 && dist > 0)		// Orientation - West
+        {
+            bottom = median1;
+            right = median2;
+            orientation = CV_QR_WEST;
+        }
+
+
+        // To ensure any unintended values do not sneak up when QR code is not present
+        float area_top, area_right, area_bottom;
+
+        if (top < contours.size() && right < contours.size() && bottom < contours.size() && contourArea(contours[top]) > 10 && contourArea(contours[right]) > 10 && contourArea(contours[bottom]) > 10)
+        {
+
+            __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n Entered Contours \n");
+
+            vector<Point2f> L, M, O, tempL, tempM, tempO;
+            Point2f N;
+
+            vector<Point2f> src, dst;		// src - Source Points basically the 4 end co-ordinates of the overlay image
+            // dst - Destination Points to transform overlay image
+
+            Mat warp_matrix;
+
+            cv_getVertices(contours, top, slope, tempL);
+            cv_getVertices(contours, right, slope, tempM);
+            cv_getVertices(contours, bottom, slope, tempO);
+
+            cv_updateCornerOr(orientation, tempL, L); 			// Re-arrange marker corners w.r.t orientation of the QR code
+            cv_updateCornerOr(orientation, tempM, M); 			// Re-arrange marker corners w.r.t orientation of the QR code
+            cv_updateCornerOr(orientation, tempO, O); 			// Re-arrange marker corners w.r.t orientation of the QR code
+
+            Point2f p1(M[1].x, M[1].y);
+            Point2f p2(M[2].x, (M[2].y - M[1].y) / 2);
+            Point2f p3(O[3].x, O[3].y);
+            Point2f p4(O[2].x, O[2].y);
+
+            int iflag = getIntersectionPoint(M[1], M[2], O[3], O[2], N);
+
+            // Insert Debug instructions here
+            if (DBG == 1)
+            {
+                __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n Entered Debug \n");
+
+                //Draw contours on the image
+                drawContours(image, contours, top, Scalar(255, 200, 0), 2, 8, hierarchy, 0);
+                drawContours(image, contours, right, Scalar(0, 0, 255), 2, 8, hierarchy, 0);
+                drawContours(image, contours, bottom, Scalar(255, 0, 100), 2, 8, hierarchy, 0);
+
+                // Debug Prints
+                // Visualizations for ease of understanding
+                if (slope > 5)
+                    circle(traces, Point(10, 20), 5, Scalar(0, 0, 255), -1, 8, 0);
+                else if (slope < -5)
+                    circle(traces, Point(10, 20), 5, Scalar(255, 255, 255), -1, 8, 0);
+
+                // Draw contours on Trace image for analysis
+                drawContours(traces, contours, top, Scalar(255, 0, 100), 1, 8, hierarchy, 0);
+                drawContours(traces, contours, right, Scalar(255, 0, 100), 1, 8, hierarchy, 0);
+                drawContours(traces, contours, bottom, Scalar(255, 0, 100), 1, 8, hierarchy, 0);
+
+                // Draw points (4 corners) on Trace image for each Identification marker
+                circle(traces, L[0], 2, Scalar(255, 255, 0), -1, 8, 0);
+                circle(traces, L[1], 2, Scalar(0, 255, 0), -1, 8, 0);
+                circle(traces, L[2], 2, Scalar(0, 0, 255), -1, 8, 0);
+                circle(traces, L[3], 2, Scalar(128, 128, 128), -1, 8, 0);
+
+                circle(traces, M[0], 2, Scalar(255, 255, 0), -1, 8, 0);
+                circle(traces, M[1], 2, Scalar(0, 255, 0), -1, 8, 0);
+                circle(traces, M[2], 2, Scalar(0, 0, 255), -1, 8, 0);
+                circle(traces, M[3], 2, Scalar(128, 128, 128), -1, 8, 0);
+
+                circle(traces, O[0], 2, Scalar(255, 255, 0), -1, 8, 0);
+                circle(traces, O[1], 2, Scalar(0, 255, 0), -1, 8, 0);
+                circle(traces, O[2], 2, Scalar(0, 0, 255), -1, 8, 0);
+                circle(traces, O[3], 2, Scalar(128, 128, 128), -1, 8, 0);
+
+                // Draw point of the estimated 4th Corner of (entire) QR Code
+                circle(traces, N, 2, Scalar(255, 255, 255), -1, 8, 0);
+
+                // Draw the lines used for estimating the 4th Corner of QR Code
+                line(traces, M[1], N, Scalar(0, 0, 255), 1, 8, 0);
+                line(traces, O[3], N, Scalar(0, 0, 255), 1, 8, 0);
+
+
+                // Show the Orientation of the QR Code wrt to 2D Image Space
+                int fontFace = FONT_HERSHEY_PLAIN;
+
+                if (orientation == CV_QR_NORTH)
+                {
+                    putText(traces, "NORTH", Point(20, 30), fontFace, 1, Scalar(0, 255, 0), 1, 8);
+                }
+                else if (orientation == CV_QR_EAST)
+                {
+                    putText(traces, "EAST", Point(20, 30), fontFace, 1, Scalar(0, 255, 0), 1, 8);
+                }
+                else if (orientation == CV_QR_SOUTH)
+                {
+                    putText(traces, "SOUTH", Point(20, 30), fontFace, 1, Scalar(0, 255, 0), 1, 8);
+                }
+                else if (orientation == CV_QR_WEST)
+                {
+                    putText(traces, "WEST", Point(20, 30), fontFace, 1, Scalar(0, 255, 0), 1, 8);
+                }
+
+                // Debug Prints
+            }
+
+            __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n Passed Debug \n");
+
+            vector<Point2f> forthPoly;
+            cv_getVertices(contours, F, slope, forthPoly);
+
+            __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n Passed getVertices \n");
+
+            if (forthPoly.size() == 4)
+            {
+                if (orientation == CV_QR_NORTH)
+                {
+                    N = forthPoly[2];
+                }
+                else if (orientation == CV_QR_EAST)
+                {
+                    N = forthPoly[3];
+                }
+                else if (orientation == CV_QR_SOUTH)
+                {
+                    N = forthPoly[0];
+                }
+                else if (orientation == CV_QR_WEST)
+                {
+                    N = forthPoly[1];
+                }
+
+                result.push_back(L[0]);
+                result.push_back(M[1]);
+                result.push_back(N);
+                result.push_back(O[3]);
+
+                __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n Done with 4 \n");
+            }
+            else {
+                __android_log_print(ANDROID_LOG_ERROR, "COLOR_CAPTURE", "\n Done with != 4 \n");
+            }
+        }
+    }
+
+    return result;
+}
+
+vector<Point2f> sortPoints(vector<Point2f> unsorted) {
+    vector<Point2f> sorted;
+    for (int i = 0; i < 4; i++)sorted.push_back(Point2f(0, 0));
+    int middleX = (unsorted[0].x + unsorted[1].x + unsorted[2].x + unsorted[3].x) / 4;
+    int middleY = (unsorted[0].y + unsorted[1].y + unsorted[2].y + unsorted[3].y) / 4;
+    for (int i = 0; i < unsorted.size(); i++) {
+        if (unsorted.at(i).x < middleX && unsorted.at(i).y < middleY)sorted[0] = unsorted.at(i);
+        if (unsorted.at(i).x > middleX && unsorted.at(i).y < middleY)sorted[1] = unsorted.at(i);
+        if (unsorted.at(i).x < middleX && unsorted.at(i).y > middleY)sorted[2] = unsorted.at(i);
+        if (unsorted.at(i).x > middleX && unsorted.at(i).y > middleY)sorted[3] = unsorted.at(i);
+    }
+    return sorted;
+}
+
+vector<Point> sortPoints(vector<Point> unsorted) {
+    vector<Point> sorted;
+    for (int i = 0; i < 4; i++)sorted.push_back(Point(0, 0));
+    int middleX = (unsorted[0].x + unsorted[1].x + unsorted[2].x + unsorted[3].x) / 4;
+    int middleY = (unsorted[0].y + unsorted[1].y + unsorted[2].y + unsorted[3].y) / 4;
+    for (int i = 0; i < unsorted.size(); i++) {
+        if (unsorted.at(i).x < middleX && unsorted.at(i).y < middleY)sorted[0] = unsorted.at(i);
+        if (unsorted.at(i).x > middleX && unsorted.at(i).y < middleY)sorted[1] = unsorted.at(i);
+        if (unsorted.at(i).x < middleX && unsorted.at(i).y > middleY)sorted[2] = unsorted.at(i);
+        if (unsorted.at(i).x > middleX && unsorted.at(i).y > middleY)sorted[3] = unsorted.at(i);
+    }
+    return sorted;
+}
+
+double angleOf(Point2f p1, Point2f p2) {
+    float angle = atan2(p1.y - p2.y, p1.x - p2.x);
+    return angle * 180 / 3.14;
+}
+
+double lengthOf(Point2f p1, Point2f p2)
+{
+    return sqrt(pow((p1.x - p2.x), 2) + pow((p1.y - p2.y), 2));
+}
+
+Point2f scale_line(Point2f p1, Point2f p2, double newlength)
+{
+    double length = lengthOf(p1, p2);
+    return Point2f(p1.x + (newlength / length) * (p2.x - p1.x), p1.y + (newlength / length) * (p2.y - p1.y));
+}
+
+Mat ColorCaptureLib::ApplyHomography(Mat image, vector<Point> vertices, Size destination_size)
+{
+    Mat im_dst = Mat::zeros(destination_size, CV_8UC3);
+
+    vector<Point2f> pts_dst;
+
+    pts_dst.push_back(Point2f(0, 0));
+    pts_dst.push_back(Point2f(destination_size.width - 1, 0));
+    pts_dst.push_back(Point2f(destination_size.width - 1, destination_size.height - 1));
+    pts_dst.push_back(Point2f(0, destination_size.height - 1));
+
+    Mat tform = findHomography(vertices, pts_dst);
+    warpPerspective(image, im_dst, tform, destination_size);
+    return im_dst;
+}
+
+Rect ColorCaptureLib::CropRect(Rect rect, Size size)
+{
+    Point center = (rect.br() + rect.tl())*0.5;
+
+    Rect cropped(center.x - size.width / 2, center.y - size.height / 2, size.width, size.height);
+
+    //Inflate Rectangle ??
+    //cv::Point inflationPoint(-20, -20);
+    //cv::Size inflationSize(20, 20);
+    //croped += inflationPoint;
+    //croped += inflationSize;
+
+    return cropped;
+}
+
+Scalar ColorCaptureLib::GetRectMeanColor(Mat image, Rect rect)
+{
+    Point pts[1][4];
+    pts[0][0] = Point(rect.x, rect.y);
+    pts[0][1] = Point(rect.x + rect.width, rect.y);
+    pts[0][2] = Point(rect.x + rect.width, rect.y + rect.height);
+    pts[0][3] = Point(rect.x, rect.y + rect.height);
+
+    const Point* points[1] = { pts[0] };
+    int npoints = 4;
+
+    // Create the mask with the polygon
+    Mat1b mask(image.rows, image.cols, uchar(0));
+
+    fillPoly(mask, points, &npoints, 1, Scalar(255));
+
+    // Compute the mean with the computed mask
+    Scalar average = mean(image, mask);
+
+    return average;
+}
+
+Mat ColorCaptureLib::GetImageRect(Mat image, Rect rect)
+{
+    Mat rectImage(rect.size(), CV_8UC3);
+    Rect dst(0, 0, rect.width, rect.height);
+    image(rect).copyTo(rectImage(dst));
+    return rectImage;
+}
+
+Mat ColorCaptureLib::Diff(Mat image, int k)
+{
+    int origRows = image.rows;
+    Mat colVec = image.reshape(1, image.rows*image.cols); // change to a Nx3 column vector
+    Mat colVecD, bestLabels, centers, clustered;
+    int attempts = 2;
+    int clusts = 2;
+    double eps = 1.0;
+    colVec.convertTo(colVecD, CV_32FC3, 1.0 / 255.0); // convert to floating point
+    double compactness = kmeans(colVecD, clusts, bestLabels, TermCriteria(CV_TERMCRIT_EPS + CV_TERMCRIT_ITER, attempts, eps), attempts, KMEANS_PP_CENTERS, centers);
+    Mat labelsImg = bestLabels.reshape(1, origRows); // single channel image of labels
+
+    return centers;
+}
+
+void ColorCaptureLib::DrawImage(Mat image, Mat draw, Rect rect)
+{
+    // Take a sub-view of the large image
+    cv::Mat subView = image(rect);
+
+    // Copy contents of the small image to large
+    draw.copyTo(subView);
+}
+
+void ColorCaptureLib::DrawHistogram(Mat image)
+{
+    /// Separate the image in 3 places ( B, G and R )
+    vector<Mat> bgr_planes;
+    split(image, bgr_planes);
+
+    /// Establish the number of bins
+    int histSize = image.cols;
+
+    /// Set the ranges ( for B,G,R) )
+    float range[] = { 0, 256 };
+    const float* histRange = { range };
+
+    bool uniform = true; bool accumulate = false;
+
+    Mat b_hist, g_hist, r_hist;
+
+    /// Compute the histograms:
+    calcHist(&bgr_planes[0], 1, 0, Mat(), b_hist, 1, &histSize, &histRange, uniform, accumulate);
+    calcHist(&bgr_planes[1], 1, 0, Mat(), g_hist, 1, &histSize, &histRange, uniform, accumulate);
+    calcHist(&bgr_planes[2], 1, 0, Mat(), r_hist, 1, &histSize, &histRange, uniform, accumulate);
+
+    /// Normalize the result to [ 0, histImage.rows ]
+    normalize(b_hist, b_hist, 0, image.rows, NORM_MINMAX, -1, Mat());
+    normalize(g_hist, g_hist, 0, image.rows, NORM_MINMAX, -1, Mat());
+    normalize(r_hist, r_hist, 0, image.rows, NORM_MINMAX, -1, Mat());
+
+    // Draw the histograms for B, G and R
+    int hist_w = image.cols;
+    int hist_h = image.rows;
+    int bin_w = cvRound((double)hist_w / histSize);
+
+    /// Draw for each channel
+    for (int i = 1; i < histSize; i++)
+    {
+        line(image, Point(bin_w*(i - 1), hist_h - cvRound(b_hist.at<float>(i - 1))),
+             Point(bin_w*(i), hist_h - cvRound(b_hist.at<float>(i))),
+             Scalar(255, 0, 0), 2, 8, 0);
+        line(image, Point(bin_w*(i - 1), hist_h - cvRound(g_hist.at<float>(i - 1))),
+             Point(bin_w*(i), hist_h - cvRound(g_hist.at<float>(i))),
+             Scalar(0, 255, 0), 2, 8, 0);
+        line(image, Point(bin_w*(i - 1), hist_h - cvRound(r_hist.at<float>(i - 1))),
+             Point(bin_w*(i), hist_h - cvRound(r_hist.at<float>(i))),
+             Scalar(0, 0, 255), 2, 8, 0);
+    }
+}
+
+Point ColorCaptureLib::GetRectCenter(Rect rect)
+{
+    Point center = (rect.br() + rect.tl())*0.5;
+    return center;
+}
+
+void ColorCaptureLib::Initialize(Mat image)
+{
+    // Creation of Intermediate 'Image' Objects required later
+    Mat gray(image.size(), CV_MAKETYPE(image.depth(), 1));			// To hold Grayscale Image
+    Mat edges(image.size(), CV_MAKETYPE(image.depth(), 1));			// To hold Grayscale Image
+    Mat traces(image.size(), CV_8UC3);								// For Debug Visuals
+    Mat qr, qr_raw, qr_gray, qr_thres;
+
+    vector<vector<Point> > contours;
+    vector<Vec4i> hierarchy;
+    vector<Point> pointsseq;    //used to save the approximated sides of each contour
+}
+
+// Function: Routine to get Distance between two points
+// Description: Given 2 points, the function returns the distance
+float ColorCaptureLib::cv_distance(Point2f P, Point2f Q)
+{
+    return sqrt(pow(abs(P.x - Q.x), 2) + pow(abs(P.y - Q.y), 2));
+}
+
+// Function: Perpendicular Distance of a Point J from line formed by Points L and M; Equation of the line ax+by+c=0
+// Description: Given 3 points, the function derives the line quation of the first two points,
+//	  calculates and returns the perpendicular distance of the the 3rd point from this line.
+float ColorCaptureLib::cv_lineEquation(Point2f L, Point2f M, Point2f J)
+{
+    float a, b, c, pdist;
+
+    a = -((M.y - L.y) / (M.x - L.x));
+    b = 1.0;
+    c = (((M.y - L.y) / (M.x - L.x)) * L.x) - L.y;
+
+    // Now that we have a, b, c from the equation ax + by + c, time to substitute (x,y) by values from the Point J
+
+    pdist = (a * J.x + (b * J.y) + c) / sqrt((a * a) + (b * b));
+    return pdist;
+}
+
+// Function: Slope of a line by two Points L and M on it; Slope of line, S = (x1 -x2) / (y1- y2)
+// Description: Function returns the slope of the line formed by given 2 points, the alignement flag
+//	  indicates the line is vertical and the slope is infinity.
+float ColorCaptureLib::cv_lineSlope(Point2f L, Point2f M, int& alignement)
+{
+    float dx, dy;
+    dx = M.x - L.x;
+    dy = M.y - L.y;
+
+    if (dy != 0)
+    {
+        alignement = 1;
+        return (dy / dx);
+    }
+    else				// Make sure we are not dividing by zero; so use 'alignement' flag
+    {
+        alignement = 0;
+        return 0.0;
+    }
+}
+
+// Function: Routine to calculate 4 Corners of the Marker in Image Space using Region partitioning
+// Theory: OpenCV Contours stores all points that describe it and these points lie the perimeter of the polygon.
+//	The below function chooses the farthest points of the polygon since they form the vertices of that polygon,
+//	exactly the points we are looking for. To choose the farthest point, the polygon is divided/partitioned into
+//	4 regions equal regions using bounding box. Distance algorithm is applied between the centre of bounding box
+//	every contour point in that region, the farthest point is deemed as the vertex of that region. Calculating
+//	for all 4 regions we obtain the 4 corners of the polygon ( - quadrilateral).
+void ColorCaptureLib::cv_getVertices(vector<vector<Point> > contours, int c_id, float slope, vector<Point2f>& quad)
+{
+    Rect box;
+    box = boundingRect(contours[c_id]);
+
+    Point2f M0, M1, M2, M3;
+    Point2f A, B, C, D, W, X, Y, Z;
+
+    A = box.tl();
+    B.x = box.br().x;
+    B.y = box.tl().y;
+    C = box.br();
+    D.x = box.tl().x;
+    D.y = box.br().y;
+
+
+    W.x = (A.x + B.x) / 2;
+    W.y = A.y;
+
+    X.x = B.x;
+    X.y = (B.y + C.y) / 2;
+
+    Y.x = (C.x + D.x) / 2;
+    Y.y = C.y;
+
+    Z.x = D.x;
+    Z.y = (D.y + A.y) / 2;
+
+    float dmax[4];
+    dmax[0] = 0.0;
+    dmax[1] = 0.0;
+    dmax[2] = 0.0;
+    dmax[3] = 0.0;
+
+    float pd1 = 0.0;
+    float pd2 = 0.0;
+
+    if (slope > 5 || slope < -5)
+    {
+
+        for (int i = 0; i < contours[c_id].size(); i++)
+        {
+            pd1 = cv_lineEquation(C, A, contours[c_id][i]);	// Position of point w.r.t the diagonal AC
+            pd2 = cv_lineEquation(B, D, contours[c_id][i]);	// Position of point w.r.t the diagonal BD
+
+            if ((pd1 >= 0.0) && (pd2 > 0.0))
+            {
+                cv_updateCorner(contours[c_id][i], W, dmax[1], M1);
+            }
+            else if ((pd1 > 0.0) && (pd2 <= 0.0))
+            {
+                cv_updateCorner(contours[c_id][i], X, dmax[2], M2);
+            }
+            else if ((pd1 <= 0.0) && (pd2 < 0.0))
+            {
+                cv_updateCorner(contours[c_id][i], Y, dmax[3], M3);
+            }
+            else if ((pd1 < 0.0) && (pd2 >= 0.0))
+            {
+                cv_updateCorner(contours[c_id][i], Z, dmax[0], M0);
+            }
+            else
+                continue;
+        }
+    }
+    else
+    {
+        int halfx = (A.x + B.x) / 2;
+        int halfy = (A.y + D.y) / 2;
+
+        for (int i = 0; i < contours[c_id].size(); i++)
+        {
+            if ((contours[c_id][i].x < halfx) && (contours[c_id][i].y <= halfy))
+            {
+                cv_updateCorner(contours[c_id][i], C, dmax[2], M0);
+            }
+            else if ((contours[c_id][i].x >= halfx) && (contours[c_id][i].y < halfy))
+            {
+                cv_updateCorner(contours[c_id][i], D, dmax[3], M1);
+            }
+            else if ((contours[c_id][i].x > halfx) && (contours[c_id][i].y >= halfy))
+            {
+                cv_updateCorner(contours[c_id][i], A, dmax[0], M2);
+            }
+            else if ((contours[c_id][i].x <= halfx) && (contours[c_id][i].y > halfy))
+            {
+                cv_updateCorner(contours[c_id][i], B, dmax[1], M3);
+            }
+        }
+    }
+
+    quad.push_back(M0);
+    quad.push_back(M1);
+    quad.push_back(M2);
+    quad.push_back(M3);
+
+}
+
+// Function: Compare a point if it more far than previously recorded farthest distance
+// Description: Farthest Point detection using reference point and baseline distance
+void ColorCaptureLib::cv_updateCorner(Point2f P, Point2f ref, float& baseline, Point2f& corner)
+{
+    float temp_dist;
+    temp_dist = cv_distance(P, ref);
+
+    if (temp_dist > baseline)
+    {
+        baseline = temp_dist;			// The farthest distance is the new baseline
+        corner = P;						// P is now the farthest point
+    }
+
+}
+
+// Function: Sequence the Corners wrt to the orientation of the QR Code
+void ColorCaptureLib::cv_updateCornerOr(int orientation, vector<Point2f> IN, vector<Point2f> &OUT)
+{
+    Point2f M0, M1, M2, M3;
+    if (orientation == CV_QR_NORTH)
+    {
+        M0 = IN[0];
+        M1 = IN[1];
+        M2 = IN[2];
+        M3 = IN[3];
+    }
+    else if (orientation == CV_QR_EAST)
+    {
+        M0 = IN[1];
+        M1 = IN[2];
+        M2 = IN[3];
+        M3 = IN[0];
+    }
+    else if (orientation == CV_QR_SOUTH)
+    {
+        M0 = IN[2];
+        M1 = IN[3];
+        M2 = IN[0];
+        M3 = IN[1];
+    }
+    else if (orientation == CV_QR_WEST)
+    {
+        M0 = IN[3];
+        M1 = IN[0];
+        M2 = IN[1];
+        M3 = IN[2];
+    }
+
+    OUT.push_back(M0);
+    OUT.push_back(M1);
+    OUT.push_back(M2);
+    OUT.push_back(M3);
+}
+
+// Function: Get the Intersection Point of the lines formed by sets of two points
+bool ColorCaptureLib::getIntersectionPoint(Point2f a1, Point2f a2, Point2f b1, Point2f b2, Point2f& intersection)
+{
+    Point2f p = a1;
+    Point2f q = b1;
+    Point2f r(a2 - a1);
+    Point2f s(b2 - b1);
+
+    if (cross(r, s) == 0) { return false; }
+
+    float t = cross(q - p, s) / cross(r, s);
+
+    intersection = p + t*r;
+    return true;
+}
+
+float ColorCaptureLib::cross(Point2f v1, Point2f v2)
+{
+    return v1.x*v2.y - v1.y*v2.x;
+}
\ No newline at end of file
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/cpp/ColorCaptureLib/ColorCaptureLib.h b/Software/Android_Studio/ColorCaptureTest/app/src/main/cpp/ColorCaptureLib/ColorCaptureLib.h
new file mode 100644
index 000000000..e699efd34
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/cpp/ColorCaptureLib/ColorCaptureLib.h
@@ -0,0 +1,65 @@
+//
+// Created by Roy on 11/6/2018.
+//
+
+
+#include <opencv2/opencv.hpp>
+#include <iostream>
+#include <cmath>
+
+#ifndef COLORCAPTURETEST_COLORCAPTURELIB_H
+#define COLORCAPTURETEST_COLORCAPTURELIB_H
+
+using namespace cv;
+using namespace std;
+
+class ColorCaptureLib {
+
+    const int CV_QR_NORTH = 0;
+    const int CV_QR_EAST = 1;
+    const int CV_QR_SOUTH = 2;
+    const int CV_QR_WEST = 3;
+
+private:
+    bool isInitialized;
+    Mat gray;
+    Mat edges;
+    Mat traces;
+    Mat qr, qr_raw, qr_gray, qr_thres;
+
+    vector<vector<Point>> contours;
+    vector<Vec4i> hierarchy;
+    vector<Point> pointsseq;    //used to save the approximated sides of each contour
+
+    int mark, A, B, C, D, F, top, right, bottom, median1, median2, outlier;
+    float AB, BC, CA, dist, slope, areat, arear, areab, large, padding;
+
+    int align, orientation;
+
+private:
+    void Initialize(Mat image);
+    float cv_distance(Point2f P, Point2f Q);					// Get Distance between two points
+    float cv_lineEquation(Point2f L, Point2f M, Point2f J);		// Perpendicular Distance of a Point J from line formed by Points L and M; Solution to equation of the line Val = ax+by+c
+    float cv_lineSlope(Point2f L, Point2f M, int& alignement);	// Slope of a line by two Points L and M on it; Slope of line, S = (x1 -x2) / (y1- y2)
+    void cv_getVertices(vector<vector<Point> > contours, int c_id, float slope, vector<Point2f>& X);
+    void cv_updateCorner(Point2f P, Point2f ref, float& baseline, Point2f& corner);
+    void cv_updateCornerOr(int orientation, vector<Point2f> IN, vector<Point2f> &OUT);
+    bool getIntersectionPoint(Point2f a1, Point2f a2, Point2f b1, Point2f b2, Point2f& intersection);
+    float cross(Point2f v1, Point2f v2);
+
+public:
+    ColorCaptureLib();
+    vector<Point> GetQRVertices(Mat image);
+    vector<Point> GetQRVertices4(Mat image);
+    Mat ApplyHomography(Mat image,vector<Point> vertices, Size destination_size);
+    Rect CropRect(Rect rect, Size size);
+    Point GetRectCenter(Rect rect);
+    Scalar GetRectMeanColor(Mat image, Rect rect);
+    Mat GetImageRect(Mat image, Rect rect);
+    Mat Diff(Mat image, int k);
+    void DrawImage(Mat image,Mat draw, Rect rect);
+    void DrawHistogram(Mat image);
+};
+
+
+#endif //COLORCAPTURETEST_COLORCAPTURELIB_H
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/cpp/native-lib.cpp b/Software/Android_Studio/ColorCaptureTest/app/src/main/cpp/native-lib.cpp
new file mode 100644
index 000000000..b9837bacd
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/cpp/native-lib.cpp
@@ -0,0 +1,116 @@
+#include <jni.h>
+#include <string>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc/imgproc_c.h>
+#include <ColorCaptureLib.h>
+#include <BhBlocks.h>
+
+using namespace cv;
+
+extern "C" JNIEXPORT jstring JNICALL
+Java_com_twine_colorcapturetest_MainActivity_stringFromJNI(
+        JNIEnv *env,
+        jobject /* this */) {
+    std::string hello = "Hello from C++";
+    return env->NewStringUTF(hello.c_str());
+}
+
+Mat *mCanny = NULL;
+
+enum RotateFlags {
+    ROTATE_90DEG_CLOCKWISE = 0, //Rotate 90 degrees clockwise
+    ROTATE_180DEG = 1, //Rotate 180 degrees clockwise
+    ROTATE_90_DEFCOUNTERCLOCKWISEDEG = 2, //Rotate 270 degrees clockwise
+};
+
+void rot90(cv::Mat &matImage, int rotflag) {
+    //1=CW, 2=CCW, 3=180
+    if (rotflag == 1) {
+        transpose(matImage, matImage);
+        flip(matImage, matImage, 1); //transpose+flip(1)=CW
+    } else if (rotflag == 2) {
+        transpose(matImage, matImage);
+        flip(matImage, matImage, 0); //transpose+flip(0)=CCW
+    } else if (rotflag == 3) {
+        flip(matImage, matImage, -1);    //flip(-1)=180
+    } else if (rotflag != 0) { //if not 0,1,2,3:
+        cout << "Unknown rotation flag(" << rotflag << ")" << endl;
+    }
+}
+
+extern "C" JNIEXPORT jboolean JNICALL
+Java_com_twine_colorcapturetest_CameraPreview_ImageProcessing(
+        JNIEnv *env, jobject instance, jint width,
+        jint height, jbyteArray NV21FrameData,
+        jintArray outPixels) {
+    jbyte *pNV21FrameData = env->GetByteArrayElements(NV21FrameData, 0);
+    jint *poutPixels = env->GetIntArrayElements(outPixels, 0);
+
+    ////
+
+    try {
+        ColorCaptureLib capture;
+
+        if (mCanny == NULL) {
+            mCanny = new Mat(height, width, CV_8UC1);
+        }
+
+        Mat yuv(height + height / 2, width, CV_8UC1, (unsigned char *) pNV21FrameData);
+        Mat rgb;
+        Mat result(width, height, CV_8UC4, (unsigned char *) poutPixels);
+        cvtColor(yuv, rgb, COLOR_YUV2RGB_NV21);
+
+        rot90(rgb,ROTATE_180DEG);
+
+/*        Point2f src_center(rgb.cols / 2.0F, rgb.rows / 2.0F);
+        Mat rot_mat = getRotationMatrix2D(src_center, -90, 1.0);
+        warpAffine(rgb, rgb, rot_mat, rgb.size());*/
+
+        vector<Point> vertices = capture.GetQRVertices4(rgb);
+
+        for (size_t i = 0; i < vertices.size(); i++) {
+            circle(rgb, vertices[i], 2, CV_RGB(0, 0, 255), -1);
+        }
+
+        int w = 330;
+        int h = 300;
+
+        if (vertices.size() == 4) {
+            //capture.ApplyHomography(rgb, vertices, Size(w, h));
+            //BhBlocks b(image, w / columns, h / rows);
+            //b.drawBlocks(image, Scalar(0, 0, 0), 1);
+        }
+
+        cvtColor(rgb, result, COLOR_RGB2BGRA);
+
+/*    vector<Point> vertices = capture.GetQRVertices4(image);
+
+    for (size_t i = 0; i < vertices.size(); i++)
+    {
+        circle(image, vertices[i], 2, CV_RGB(0, 0, 255), -1);
+    }
+
+    int w = 330;
+    int h = 300;
+    int columns = 11;
+    int rows = 10;
+
+    if (vertices.size() == 4)
+    {
+        capture.ApplyHomography(image, vertices, Size(w, h));
+        BhBlocks b(image, w / columns, h / rows);
+        b.drawBlocks(image, Scalar(0, 0, 0), 1);
+    }*/
+
+
+        jsize size = env->GetArrayLength(outPixels);
+
+        env->ReleaseByteArrayElements(NV21FrameData, pNV21FrameData, 0);
+        env->ReleaseIntArrayElements(outPixels, poutPixels, 0);
+    }
+    catch (Exception ex)
+    {
+        env->ThrowNew(env->FindClass("java/lang/NullPointerException"), ex.what());
+    }
+    return static_cast<jboolean>(true);
+}
\ No newline at end of file
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/java/com/twine/colorcapturetest/CameraPreview.java b/Software/Android_Studio/ColorCaptureTest/app/src/main/java/com/twine/colorcapturetest/CameraPreview.java
new file mode 100644
index 000000000..e8452c750
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/java/com/twine/colorcapturetest/CameraPreview.java
@@ -0,0 +1,250 @@
+package com.twine.colorcapturetest;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.ImageFormat;
+import android.graphics.YuvImage;
+import android.hardware.Camera;
+import android.hardware.Camera.CameraInfo;
+import android.hardware.Camera.Size;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.Display;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.WindowManager;
+import android.widget.ImageView;
+
+import java.io.IOException;
+import java.util.List;
+
+import static android.content.Context.WINDOW_SERVICE;
+
+/*
+ *  CameraPreview.java
+ */
+public class CameraPreview implements SurfaceHolder.Callback, Camera.PreviewCallback
+{
+    private Camera mCamera = null;
+    private ImageView MyCameraPreview = null;
+    private Bitmap bitmap = null;
+    private int[] pixels = null;
+    private byte[] FrameData = null;
+    private int imageFormat;
+    private int PreviewSizeWidth;
+    private int PreviewSizeHeight;
+    private boolean bProcessing = false;
+    private Activity context;
+    private int cameraId;
+    
+    Handler mHandler = new Handler(Looper.getMainLooper());
+    
+    public CameraPreview(int PreviewlayoutWidth, int PreviewlayoutHeight, ImageView CameraPreview, Activity context)
+    {
+        this.context = context;
+        PreviewSizeWidth = PreviewlayoutWidth;
+        PreviewSizeHeight = PreviewlayoutHeight;
+        MyCameraPreview = CameraPreview;
+        
+    }
+    
+    @Override
+    public void onPreviewFrame(byte[] data, Camera arg1)
+    {
+        // At preview mode, the frame data will push to here.
+        if (imageFormat == ImageFormat.NV21)
+        {
+            //We only accept the NV21(YUV420) format.
+            if (!bProcessing)
+            {
+                FrameData = data;
+                mHandler.post(DoImageProcessing);
+            }
+        }
+    }
+    
+    public void onPause()
+    {
+        mCamera.stopPreview();
+    }
+    
+    @Override
+    public void surfaceChanged(SurfaceHolder arg0, int arg1, int arg2, int arg3)
+    {
+        Camera.Parameters parameters;
+        
+        setCameraDisplayOrientation(context, cameraId, mCamera);
+        
+        parameters = mCamera.getParameters();
+        // Set the camera preview size
+        //parameters.setPreviewSize(PreviewSizeWidth, PreviewSizeHeight);
+        
+        List<Size> sizes = parameters.getSupportedPreviewSizes();
+        
+        for (Camera.Size size : parameters.getSupportedPreviewSizes())
+        {
+            // 640 480
+            // 960 720
+            // 1024 768
+            // 1280 720
+            // 1600 1200
+            // 2560 1920
+            // 3264 2448
+            // 2048 1536
+            // 3264 1836
+            // 2048 1152
+            // 3264 2176
+            if (size.width >= 1200 & size.width <= 1280)
+            {
+                parameters.setPreviewSize(1280, 720);
+                parameters.setPictureSize(1280, 720);
+                break;
+            }
+        }
+        
+        //mCamera.setDisplayOrientation(90);
+        
+        int width = parameters.getPreviewSize().width;
+        int height = parameters.getPreviewSize().height;
+        
+        imageFormat = parameters.getPreviewFormat();
+    
+/*        Display display = ((WindowManager)context.getSystemService(WINDOW_SERVICE)).getDefaultDisplay();
+    
+        if(display.getRotation() == Surface.ROTATION_0) {
+            //parameters.setPreviewSize(height, width);
+            mCamera.setDisplayOrientation(90);
+        }
+    
+        if(display.getRotation() == Surface.ROTATION_90) {
+            //parameters.setPreviewSize(width, height);
+        }
+    
+        if(display.getRotation() == Surface.ROTATION_180) {
+            //parameters.setPreviewSize(height, width);
+        }
+    
+        if(display.getRotation() == Surface.ROTATION_270) {
+            //parameters.setPreviewSize(width, height);
+            mCamera.setDisplayOrientation(180);
+        }*/
+    
+        parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
+
+        mCamera.setParameters(parameters);
+        
+        parameters = mCamera.getParameters();
+        
+        PreviewSizeWidth = parameters.getPreviewSize().width;
+        PreviewSizeHeight = parameters.getPreviewSize().height;
+        
+        bitmap = Bitmap.createBitmap(PreviewSizeHeight, PreviewSizeWidth, Bitmap.Config.ARGB_8888);
+        
+        pixels = new int[PreviewSizeWidth * PreviewSizeHeight];
+        
+        mCamera.startPreview();
+    }
+    
+    public static void setCameraDisplayOrientation(Activity activity,
+                                                   int cameraId, android.hardware.Camera camera)
+    {
+        android.hardware.Camera.CameraInfo info =
+                new android.hardware.Camera.CameraInfo();
+        android.hardware.Camera.getCameraInfo(cameraId, info);
+        int rotation = activity.getWindowManager().getDefaultDisplay().getRotation();
+        int degrees = 0;
+        switch (rotation)
+        {
+            case Surface.ROTATION_0:
+                degrees = 0;
+                break;
+            case Surface.ROTATION_90:
+                degrees = 90;
+                break;
+            case Surface.ROTATION_180:
+                degrees = 180;
+                break;
+            case Surface.ROTATION_270:
+                degrees = 270;
+                break;
+        }
+        
+        int result;
+        if (info.facing == CameraInfo.CAMERA_FACING_FRONT)
+        {
+            result = (info.orientation + degrees) % 360;
+            result = (360 - result) % 360;  // compensate the mirror
+        }
+        else
+        {  // back-facing
+            result = (info.orientation - degrees + 360) % 360;
+        }
+        camera.setDisplayOrientation(result);
+        
+    }
+    
+    @Override
+    public void surfaceCreated(SurfaceHolder arg0)
+    {
+        int numberOfCameras = Camera.getNumberOfCameras();
+        for (int i = 0; i < numberOfCameras; i++)
+        {
+            CameraInfo info = new CameraInfo();
+            Camera.getCameraInfo(i, info);
+            if (info.facing == CameraInfo.CAMERA_FACING_BACK)
+            {
+                cameraId = i;
+                break;
+            }
+        }
+        
+        mCamera = Camera.open(cameraId);
+        try
+        {
+            // If did not set the SurfaceHolder, the preview area will be black.
+            mCamera.setPreviewDisplay(arg0);
+            mCamera.setPreviewCallback(this);
+        }
+        catch (IOException e)
+        {
+            mCamera.release();
+            mCamera = null;
+        }
+    }
+    
+    @Override
+    public void surfaceDestroyed(SurfaceHolder arg0)
+    {
+        mCamera.setPreviewCallback(null);
+        mCamera.stopPreview();
+        mCamera.release();
+        mCamera = null;
+    }
+    
+    //
+    // Native JNI
+    //
+    public native boolean ImageProcessing(int width, int height,
+                                          byte[] NV21FrameData, int[] pixels);
+    
+    
+    static
+    {
+        System.loadLibrary("native-lib");
+        System.loadLibrary("opencv_java3");
+    }
+    
+    private Runnable DoImageProcessing = new Runnable()
+    {
+        public void run()
+        {
+            bProcessing = true;
+            ImageProcessing(PreviewSizeWidth,PreviewSizeHeight , FrameData, pixels);
+            
+            bitmap.setPixels(pixels, 0, PreviewSizeHeight, 0, 0, PreviewSizeHeight, PreviewSizeWidth);
+            MyCameraPreview.setImageBitmap(bitmap);
+            bProcessing = false;
+        }
+    };
+}
\ No newline at end of file
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/java/com/twine/colorcapturetest/MainActivity.java b/Software/Android_Studio/ColorCaptureTest/app/src/main/java/com/twine/colorcapturetest/MainActivity.java
new file mode 100644
index 000000000..936abd15b
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/java/com/twine/colorcapturetest/MainActivity.java
@@ -0,0 +1,105 @@
+package com.twine.colorcapturetest;
+
+import android.Manifest;
+import android.content.pm.PackageManager;
+import android.hardware.Camera;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class MainActivity extends AppCompatActivity
+{
+    private CameraPreview camPreview;
+    private int PreviewSizeWidth = 640;
+    private int PreviewSizeHeight= 480;
+    private SurfaceView camView;
+    
+    
+    // Used to load the 'native-lib' library on application startup.
+    static
+    {
+        System.loadLibrary("opencv_java3");
+        System.loadLibrary("native-lib");
+    }
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        
+        // Example of a call to a native method
+        TextView tv = (TextView) findViewById(R.id.sample_text);
+        tv.setText(stringFromJNI());
+        
+        ImageView imageView = findViewById(R.id.imageView);
+    
+        camView = new SurfaceView(this);
+        SurfaceHolder camHolder = camView.getHolder();
+        camPreview = new CameraPreview(PreviewSizeWidth, PreviewSizeHeight, imageView,this);
+    
+        camHolder.addCallback(camPreview);
+        camHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
+    
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+                ActivityCompat.requestPermissions(this,
+                        new String[]{Manifest.permission.CAMERA},
+                        1);
+            }
+            else
+            {
+                FrameLayout mainLayout = (FrameLayout) findViewById(R.id.frameLayout);
+                mainLayout.addView(camView, new FrameLayout.LayoutParams(PreviewSizeWidth, PreviewSizeHeight));
+            }
+        
+        }
+    
+
+    }
+    
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        
+        switch (requestCode) {
+            case 1: {
+                
+                // If request is cancelled, the result arrays are empty.
+                if (grantResults.length > 0
+                        && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+    
+                    FrameLayout mainLayout = (FrameLayout) findViewById(R.id.frameLayout);
+                    mainLayout.addView(camView);
+                    // permission was granted, yay! Do the
+                    // camera-related task you need to do.
+                } else {
+                    
+                    // permission denied, boo! Disable the
+                    // functionality that depends on this permission.
+                    
+                    Toast.makeText(this, "Permission denied to access camera", Toast.LENGTH_SHORT).show();
+                    finish();
+                }
+            }
+            
+            // other 'case' lines to check for other
+            // permissions this app might request
+        }
+    }
+    
+    /**
+     * A native method that is implemented by the 'native-lib' native library,
+     * which is packaged with this application.
+     */
+    public native String stringFromJNI();
+}
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_calib3d.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_calib3d.a
new file mode 100644
index 000000000..9abd0f573
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_calib3d.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_core.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_core.a
new file mode 100644
index 000000000..b06963683
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_core.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_dnn.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_dnn.a
new file mode 100644
index 000000000..e71f00a35
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_dnn.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_features2d.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_features2d.a
new file mode 100644
index 000000000..fc3796277
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_features2d.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_flann.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_flann.a
new file mode 100644
index 000000000..8eec64fd3
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_flann.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_highgui.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_highgui.a
new file mode 100644
index 000000000..70a9d05a6
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_highgui.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_imgcodecs.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_imgcodecs.a
new file mode 100644
index 000000000..c445cc759
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_imgcodecs.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_imgproc.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_imgproc.a
new file mode 100644
index 000000000..d04013941
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_imgproc.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_java3.so b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_java3.so
new file mode 100644
index 000000000..bc6fac945
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_java3.so
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_ml.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_ml.a
new file mode 100644
index 000000000..17d52e944
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_ml.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_objdetect.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_objdetect.a
new file mode 100644
index 000000000..846de5971
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_objdetect.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_photo.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_photo.a
new file mode 100644
index 000000000..f9ffa955e
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_photo.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_shape.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_shape.a
new file mode 100644
index 000000000..3b672372e
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_shape.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_stitching.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_stitching.a
new file mode 100644
index 000000000..c9361ea6b
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_stitching.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_superres.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_superres.a
new file mode 100644
index 000000000..7f8aaf3e4
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_superres.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_video.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_video.a
new file mode 100644
index 000000000..fb6bd2102
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_video.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_videoio.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_videoio.a
new file mode 100644
index 000000000..19f395069
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_videoio.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_videostab.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_videostab.a
new file mode 100644
index 000000000..f3d9b6e91
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/arm64-v8a/libopencv_videostab.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_calib3d.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_calib3d.a
new file mode 100644
index 000000000..1f06a50bb
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_calib3d.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_core.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_core.a
new file mode 100644
index 000000000..2801ee084
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_core.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_dnn.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_dnn.a
new file mode 100644
index 000000000..358e8fd3e
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_dnn.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_features2d.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_features2d.a
new file mode 100644
index 000000000..01ed76acf
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_features2d.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_flann.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_flann.a
new file mode 100644
index 000000000..612ef1da7
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_flann.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_highgui.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_highgui.a
new file mode 100644
index 000000000..b5a9710fc
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_highgui.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_imgcodecs.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_imgcodecs.a
new file mode 100644
index 000000000..e39238d65
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_imgcodecs.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_imgproc.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_imgproc.a
new file mode 100644
index 000000000..c1e211cfe
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_imgproc.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_java3.so b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_java3.so
new file mode 100644
index 000000000..82b92390a
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_java3.so
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_ml.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_ml.a
new file mode 100644
index 000000000..8c8973ae9
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_ml.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_objdetect.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_objdetect.a
new file mode 100644
index 000000000..06b88a0ee
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_objdetect.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_photo.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_photo.a
new file mode 100644
index 000000000..30923d0a1
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_photo.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_shape.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_shape.a
new file mode 100644
index 000000000..5c98796dd
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_shape.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_stitching.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_stitching.a
new file mode 100644
index 000000000..20c795925
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_stitching.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_superres.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_superres.a
new file mode 100644
index 000000000..a6807a52f
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_superres.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_video.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_video.a
new file mode 100644
index 000000000..e23e6b15a
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_video.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_videoio.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_videoio.a
new file mode 100644
index 000000000..fffb1d742
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_videoio.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_videostab.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_videostab.a
new file mode 100644
index 000000000..365d852b5
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi-v7a/libopencv_videostab.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_calib3d.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_calib3d.a
new file mode 100644
index 000000000..e487c44f5
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_calib3d.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_core.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_core.a
new file mode 100644
index 000000000..7432d89a8
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_core.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_dnn.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_dnn.a
new file mode 100644
index 000000000..98c2030b4
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_dnn.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_features2d.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_features2d.a
new file mode 100644
index 000000000..e64433499
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_features2d.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_flann.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_flann.a
new file mode 100644
index 000000000..5c801c858
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_flann.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_highgui.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_highgui.a
new file mode 100644
index 000000000..6f7a4af57
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_highgui.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_imgcodecs.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_imgcodecs.a
new file mode 100644
index 000000000..1d91719d9
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_imgcodecs.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_imgproc.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_imgproc.a
new file mode 100644
index 000000000..5a27d415b
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_imgproc.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_java3.so b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_java3.so
new file mode 100644
index 000000000..ce45ebc78
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_java3.so
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_ml.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_ml.a
new file mode 100644
index 000000000..9c8feae1c
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_ml.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_objdetect.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_objdetect.a
new file mode 100644
index 000000000..f8262c780
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_objdetect.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_photo.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_photo.a
new file mode 100644
index 000000000..d52a63d4c
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_photo.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_shape.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_shape.a
new file mode 100644
index 000000000..b68456f99
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_shape.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_stitching.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_stitching.a
new file mode 100644
index 000000000..17542e825
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_stitching.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_superres.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_superres.a
new file mode 100644
index 000000000..26acb9dcc
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_superres.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_video.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_video.a
new file mode 100644
index 000000000..21846dfc1
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_video.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_videoio.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_videoio.a
new file mode 100644
index 000000000..6a7eb6a3c
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_videoio.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_videostab.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_videostab.a
new file mode 100644
index 000000000..eff32ee64
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/armeabi/libopencv_videostab.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_calib3d.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_calib3d.a
new file mode 100644
index 000000000..49c51e69e
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_calib3d.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_core.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_core.a
new file mode 100644
index 000000000..a4b97a3dd
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_core.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_dnn.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_dnn.a
new file mode 100644
index 000000000..0b774b24f
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_dnn.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_features2d.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_features2d.a
new file mode 100644
index 000000000..10708da04
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_features2d.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_flann.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_flann.a
new file mode 100644
index 000000000..9f7a8c257
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_flann.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_highgui.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_highgui.a
new file mode 100644
index 000000000..c99750415
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_highgui.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_imgcodecs.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_imgcodecs.a
new file mode 100644
index 000000000..478e67667
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_imgcodecs.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_imgproc.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_imgproc.a
new file mode 100644
index 000000000..d6651f238
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_imgproc.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_java3.so b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_java3.so
new file mode 100644
index 000000000..b9788ef93
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_java3.so
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_ml.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_ml.a
new file mode 100644
index 000000000..e5cf3231b
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_ml.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_objdetect.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_objdetect.a
new file mode 100644
index 000000000..ed014173d
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_objdetect.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_photo.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_photo.a
new file mode 100644
index 000000000..5ba8ae142
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_photo.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_shape.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_shape.a
new file mode 100644
index 000000000..2f3c1dd68
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_shape.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_stitching.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_stitching.a
new file mode 100644
index 000000000..b1411fc82
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_stitching.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_superres.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_superres.a
new file mode 100644
index 000000000..75aff6840
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_superres.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_video.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_video.a
new file mode 100644
index 000000000..aa8322dc9
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_video.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_videoio.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_videoio.a
new file mode 100644
index 000000000..228b138ba
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_videoio.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_videostab.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_videostab.a
new file mode 100644
index 000000000..bf8e4eff1
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips/libopencv_videostab.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_calib3d.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_calib3d.a
new file mode 100644
index 000000000..388e5575b
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_calib3d.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_core.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_core.a
new file mode 100644
index 000000000..8ff29eaef
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_core.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_dnn.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_dnn.a
new file mode 100644
index 000000000..deb49a942
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_dnn.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_features2d.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_features2d.a
new file mode 100644
index 000000000..046008bed
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_features2d.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_flann.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_flann.a
new file mode 100644
index 000000000..3c50c42c8
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_flann.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_highgui.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_highgui.a
new file mode 100644
index 000000000..99b71344e
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_highgui.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_imgcodecs.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_imgcodecs.a
new file mode 100644
index 000000000..dd1140582
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_imgcodecs.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_imgproc.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_imgproc.a
new file mode 100644
index 000000000..718e130e3
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_imgproc.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_java3.so b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_java3.so
new file mode 100644
index 000000000..2d2b7bc49
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_java3.so
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_ml.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_ml.a
new file mode 100644
index 000000000..f58d011b9
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_ml.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_objdetect.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_objdetect.a
new file mode 100644
index 000000000..678ebba6b
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_objdetect.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_photo.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_photo.a
new file mode 100644
index 000000000..1584a383a
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_photo.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_shape.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_shape.a
new file mode 100644
index 000000000..59abae3b5
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_shape.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_stitching.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_stitching.a
new file mode 100644
index 000000000..32c686e1a
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_stitching.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_superres.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_superres.a
new file mode 100644
index 000000000..5f6313503
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_superres.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_video.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_video.a
new file mode 100644
index 000000000..67bc327a5
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_video.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_videoio.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_videoio.a
new file mode 100644
index 000000000..02dbb319e
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_videoio.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_videostab.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_videostab.a
new file mode 100644
index 000000000..b913981ff
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/mips64/libopencv_videostab.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_calib3d.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_calib3d.a
new file mode 100644
index 000000000..2d12e0c52
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_calib3d.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_core.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_core.a
new file mode 100644
index 000000000..4aa87a741
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_core.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_dnn.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_dnn.a
new file mode 100644
index 000000000..29eb811ae
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_dnn.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_features2d.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_features2d.a
new file mode 100644
index 000000000..de657cfb2
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_features2d.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_flann.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_flann.a
new file mode 100644
index 000000000..838876c00
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_flann.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_highgui.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_highgui.a
new file mode 100644
index 000000000..1ba1d40d8
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_highgui.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_imgcodecs.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_imgcodecs.a
new file mode 100644
index 000000000..86376a32f
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_imgcodecs.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_imgproc.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_imgproc.a
new file mode 100644
index 000000000..eb32dc066
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_imgproc.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_java3.so b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_java3.so
new file mode 100644
index 000000000..66fbed57d
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_java3.so
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_ml.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_ml.a
new file mode 100644
index 000000000..4ef42ef5b
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_ml.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_objdetect.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_objdetect.a
new file mode 100644
index 000000000..1dcd3a84a
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_objdetect.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_photo.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_photo.a
new file mode 100644
index 000000000..acecc4b69
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_photo.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_shape.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_shape.a
new file mode 100644
index 000000000..6ffa4ea83
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_shape.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_stitching.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_stitching.a
new file mode 100644
index 000000000..cbc7e0fe0
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_stitching.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_superres.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_superres.a
new file mode 100644
index 000000000..b94b89085
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_superres.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_video.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_video.a
new file mode 100644
index 000000000..a459bc149
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_video.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_videoio.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_videoio.a
new file mode 100644
index 000000000..f775cc7ee
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_videoio.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_videostab.a b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_videostab.a
new file mode 100644
index 000000000..bf55df407
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/jniLibs/x86_64/libopencv_videostab.a
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 000000000..1f6bb2906
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/drawable/ic_launcher_background.xml b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 000000000..0d025f9bf
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#008577"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/layout/activity_main.xml b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 000000000..3713cafd0
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <TextView
+        android:id="@+id/sample_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginStart="159dp"
+        android:layout_marginBottom="7dp"
+        android:text="Hello World!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.888" />
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginTop="0dp"
+        android:scaleType="centerCrop"
+        app:srcCompat="@mipmap/ic_launcher"
+        tools:layout_editor_absoluteX="16dp"
+        tools:layout_editor_absoluteY="16dp" />
+
+    <FrameLayout
+        android:id="@+id/frameLayout"
+        android:layout_width="129dp"
+        android:layout_height="192dp"
+        android:layout_alignEnd="@+id/imageView"
+        android:layout_alignParentBottom="true"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        tools:layout_editor_absoluteX="290dp"
+        tools:layout_editor_absoluteY="455dp">
+
+    </FrameLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 000000000..eca70cfe5
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 000000000..eca70cfe5
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..898f3ed59
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 000000000..dffca3601
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..64ba76f75
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 000000000..dae5e0823
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..e5ed46597
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..14ed0af35
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..b0907cac3
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..d8ae03154
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..2c18de9e6
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..beed3cdd2
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/values/colors.xml b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/values/colors.xml
new file mode 100644
index 000000000..69b22338c
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
+</resources>
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/main/res/values/strings.xml b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/values/strings.xml
new file mode 100644
index 000000000..2b3a502ea
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">ColorCaptureTest</string>
+</resources>
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/values/styles.xml b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/values/styles.xml
index 5885930df..5885930df 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/values/styles.xml
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/main/res/values/styles.xml
diff --git a/Software/Android_Studio/ColorCaptureTest/app/src/test/java/com/twine/colorcapturetest/ExampleUnitTest.java b/Software/Android_Studio/ColorCaptureTest/app/src/test/java/com/twine/colorcapturetest/ExampleUnitTest.java
new file mode 100644
index 000000000..0f8a3e314
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/app/src/test/java/com/twine/colorcapturetest/ExampleUnitTest.java
@@ -0,0 +1,19 @@
+package com.twine.colorcapturetest;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest
+{
+    @Test
+    public void addition_isCorrect()
+    {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/Software/Android_Studio/ColorCaptureTest/build.gradle b/Software/Android_Studio/ColorCaptureTest/build.gradle
new file mode 100644
index 000000000..8d3ef8e5c
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/build.gradle
@@ -0,0 +1,27 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/Software/Android_Studio/ColorCaptureTest/gradle.properties b/Software/Android_Studio/ColorCaptureTest/gradle.properties
new file mode 100644
index 000000000..82618cecb
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/gradle.properties
@@ -0,0 +1,15 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+
diff --git a/Software/Android_Studio/ColorCaptureTest/gradle/wrapper/gradle-wrapper.jar b/Software/Android_Studio/ColorCaptureTest/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..f6b961fd5
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/gradle/wrapper/gradle-wrapper.jar
diff --git a/Software/Android_Studio/ColorCaptureTest/gradle/wrapper/gradle-wrapper.properties b/Software/Android_Studio/ColorCaptureTest/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..9a4163a4f
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/Software/Android_Studio/ColorCaptureTest/gradlew b/Software/Android_Studio/ColorCaptureTest/gradlew
new file mode 100644
index 000000000..cccdd3d51
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/Software/Android_Studio/ColorCaptureTest/gradlew.bat b/Software/Android_Studio/ColorCaptureTest/gradlew.bat
new file mode 100644
index 000000000..f9553162f
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/Software/Android_Studio/ColorCaptureTest/settings.gradle b/Software/Android_Studio/ColorCaptureTest/settings.gradle
new file mode 100644
index 000000000..e7b4def49
--- /dev/null
+++ b/Software/Android_Studio/ColorCaptureTest/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/Software/Android_Studio/.gitignore b/Software/Android_Studio/Tango/.gitignore
index 39fb081a4..39fb081a4 100644
--- a/Software/Android_Studio/.gitignore
+++ b/Software/Android_Studio/Tango/.gitignore
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/attr/R.txt b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/attr/R.txt
index a8028d5c7..a8028d5c7 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/attr/R.txt
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/attr/R.txt
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/compileDebugAidl/dependency.store b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/compileDebugAidl/dependency.store
index 8b8400dcf..8b8400dcf 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/compileDebugAidl/dependency.store
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/compileDebugAidl/dependency.store
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/compileDebugAndroidTestAidl/dependency.store b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/compileDebugAndroidTestAidl/dependency.store
index 8b8400dcf..8b8400dcf 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/compileDebugAndroidTestAidl/dependency.store
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/compileDebugAndroidTestAidl/dependency.store
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index b86eb9c5b..b86eb9c5b 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-af/values-af.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-af/values-af.xml
index 1afc75584..1afc75584 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-af/values-af.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-af/values-af.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-am/values-am.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-am/values-am.xml
index 750aecf58..750aecf58 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-am/values-am.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-am/values-am.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ar/values-ar.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ar/values-ar.xml
index 4a4a5e118..4a4a5e118 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ar/values-ar.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ar/values-ar.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-az/values-az.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-az/values-az.xml
index 59aa1cd1f..59aa1cd1f 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-az/values-az.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-az/values-az.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml
index 05e53a7c4..05e53a7c4 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-be/values-be.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-be/values-be.xml
index 1bc6dccd2..1bc6dccd2 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-be/values-be.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-be/values-be.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bg/values-bg.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bg/values-bg.xml
index 44f7a285e..44f7a285e 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bg/values-bg.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bg/values-bg.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bn/values-bn.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bn/values-bn.xml
index 89f21d1a3..89f21d1a3 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bn/values-bn.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bn/values-bn.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bs/values-bs.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bs/values-bs.xml
index 1c7eff089..1c7eff089 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bs/values-bs.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bs/values-bs.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ca/values-ca.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ca/values-ca.xml
index d615d9467..d615d9467 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ca/values-ca.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ca/values-ca.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-cs/values-cs.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-cs/values-cs.xml
index 474b37e8e..474b37e8e 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-cs/values-cs.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-cs/values-cs.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-da/values-da.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-da/values-da.xml
index e397602a6..e397602a6 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-da/values-da.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-da/values-da.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-de/values-de.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-de/values-de.xml
index 389dcf30c..389dcf30c 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-de/values-de.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-de/values-de.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-el/values-el.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-el/values-el.xml
index d68df63f9..d68df63f9 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-el/values-el.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-el/values-el.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rAU/values-en-rAU.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rAU/values-en-rAU.xml
index 35ea31a0b..35ea31a0b 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rAU/values-en-rAU.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rAU/values-en-rAU.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rGB/values-en-rGB.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rGB/values-en-rGB.xml
index 35ea31a0b..35ea31a0b 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rGB/values-en-rGB.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rGB/values-en-rGB.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rIN/values-en-rIN.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rIN/values-en-rIN.xml
index 35ea31a0b..35ea31a0b 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rIN/values-en-rIN.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rIN/values-en-rIN.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es-rUS/values-es-rUS.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es-rUS/values-es-rUS.xml
index 0a34b1b67..0a34b1b67 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es-rUS/values-es-rUS.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es-rUS/values-es-rUS.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es/values-es.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es/values-es.xml
index 063a7f6cb..063a7f6cb 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es/values-es.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es/values-es.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-et/values-et.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-et/values-et.xml
index b4cfc016b..b4cfc016b 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-et/values-et.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-et/values-et.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-eu/values-eu.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-eu/values-eu.xml
index 74fc58b7e..74fc58b7e 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-eu/values-eu.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-eu/values-eu.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fa/values-fa.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fa/values-fa.xml
index 8b325d389..8b325d389 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fa/values-fa.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fa/values-fa.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fi/values-fi.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fi/values-fi.xml
index b6aa778be..b6aa778be 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fi/values-fi.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fi/values-fi.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr-rCA/values-fr-rCA.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr-rCA/values-fr-rCA.xml
index 9ff50e1c3..9ff50e1c3 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr-rCA/values-fr-rCA.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr-rCA/values-fr-rCA.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr/values-fr.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr/values-fr.xml
index 1334f3934..1334f3934 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr/values-fr.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr/values-fr.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gl/values-gl.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gl/values-gl.xml
index e64cee80f..e64cee80f 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gl/values-gl.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gl/values-gl.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gu/values-gu.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gu/values-gu.xml
index 00e9de34e..00e9de34e 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gu/values-gu.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gu/values-gu.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml
index e38bb90b3..e38bb90b3 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml
index d5a138ef9..d5a138ef9 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hi/values-hi.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hi/values-hi.xml
index 89057c403..89057c403 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hi/values-hi.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hi/values-hi.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hr/values-hr.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hr/values-hr.xml
index ca0de2066..ca0de2066 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hr/values-hr.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hr/values-hr.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hu/values-hu.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hu/values-hu.xml
index b2ebff507..b2ebff507 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hu/values-hu.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hu/values-hu.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hy/values-hy.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hy/values-hy.xml
index ffaeec02c..ffaeec02c 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hy/values-hy.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hy/values-hy.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-in/values-in.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-in/values-in.xml
index 1d32fa19f..1d32fa19f 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-in/values-in.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-in/values-in.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-is/values-is.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-is/values-is.xml
index 6cd2b4662..6cd2b4662 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-is/values-is.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-is/values-is.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-it/values-it.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-it/values-it.xml
index 103f40d92..103f40d92 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-it/values-it.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-it/values-it.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-iw/values-iw.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-iw/values-iw.xml
index 1ca9be604..1ca9be604 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-iw/values-iw.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-iw/values-iw.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ja/values-ja.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ja/values-ja.xml
index dc08b9f10..dc08b9f10 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ja/values-ja.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ja/values-ja.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ka/values-ka.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ka/values-ka.xml
index 3f321189d..3f321189d 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ka/values-ka.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ka/values-ka.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kk/values-kk.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kk/values-kk.xml
index a00d111a3..a00d111a3 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kk/values-kk.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kk/values-kk.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-km/values-km.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-km/values-km.xml
index a2dd37a14..a2dd37a14 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-km/values-km.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-km/values-km.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kn/values-kn.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kn/values-kn.xml
index 99cdffd61..99cdffd61 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kn/values-kn.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kn/values-kn.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ko/values-ko.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ko/values-ko.xml
index ca9863058..ca9863058 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ko/values-ko.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ko/values-ko.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ky/values-ky.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ky/values-ky.xml
index 2493032a1..2493032a1 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ky/values-ky.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ky/values-ky.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-land/values-land.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-land/values-land.xml
index b337bad0d..b337bad0d 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-land/values-land.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-land/values-land.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-large-v4/values-large-v4.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-large-v4/values-large-v4.xml
index cc236ebd9..cc236ebd9 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-large-v4/values-large-v4.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-large-v4/values-large-v4.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ldltr-v21/values-ldltr-v21.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ldltr-v21/values-ldltr-v21.xml
index 1bdd835a6..1bdd835a6 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ldltr-v21/values-ldltr-v21.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ldltr-v21/values-ldltr-v21.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lo/values-lo.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lo/values-lo.xml
index 933aed34a..933aed34a 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lo/values-lo.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lo/values-lo.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lt/values-lt.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lt/values-lt.xml
index 626021b60..626021b60 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lt/values-lt.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lt/values-lt.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lv/values-lv.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lv/values-lv.xml
index df56b8252..df56b8252 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lv/values-lv.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lv/values-lv.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mk/values-mk.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mk/values-mk.xml
index b993d0eab..b993d0eab 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mk/values-mk.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mk/values-mk.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ml/values-ml.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ml/values-ml.xml
index e02d1db63..e02d1db63 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ml/values-ml.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ml/values-ml.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mn/values-mn.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mn/values-mn.xml
index 1697b484a..1697b484a 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mn/values-mn.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mn/values-mn.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mr/values-mr.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mr/values-mr.xml
index e69e00178..e69e00178 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mr/values-mr.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mr/values-mr.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ms/values-ms.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ms/values-ms.xml
index f9ffc5cf7..f9ffc5cf7 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ms/values-ms.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ms/values-ms.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-my/values-my.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-my/values-my.xml
index f5e479c3f..f5e479c3f 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-my/values-my.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-my/values-my.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nb/values-nb.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nb/values-nb.xml
index 93d382db4..93d382db4 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nb/values-nb.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nb/values-nb.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ne/values-ne.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ne/values-ne.xml
index 881cfefbd..881cfefbd 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ne/values-ne.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ne/values-ne.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-night-v8/values-night-v8.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-night-v8/values-night-v8.xml
index 17a211063..17a211063 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-night-v8/values-night-v8.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-night-v8/values-night-v8.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nl/values-nl.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nl/values-nl.xml
index 299238147..299238147 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nl/values-nl.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nl/values-nl.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pa/values-pa.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pa/values-pa.xml
index 9e62b2c35..9e62b2c35 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pa/values-pa.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pa/values-pa.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pl/values-pl.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pl/values-pl.xml
index 92d51ef3a..92d51ef3a 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pl/values-pl.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pl/values-pl.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-port/values-port.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-port/values-port.xml
index 7a925dc76..7a925dc76 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-port/values-port.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-port/values-port.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rBR/values-pt-rBR.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rBR/values-pt-rBR.xml
index fd255af3c..fd255af3c 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rBR/values-pt-rBR.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rBR/values-pt-rBR.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rPT/values-pt-rPT.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rPT/values-pt-rPT.xml
index f5d2be7ae..f5d2be7ae 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rPT/values-pt-rPT.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rPT/values-pt-rPT.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt/values-pt.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt/values-pt.xml
index fd255af3c..fd255af3c 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt/values-pt.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt/values-pt.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ro/values-ro.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ro/values-ro.xml
index 4ac34390b..4ac34390b 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ro/values-ro.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ro/values-ro.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ru/values-ru.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ru/values-ru.xml
index 029a403ed..029a403ed 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ru/values-ru.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ru/values-ru.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-si/values-si.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-si/values-si.xml
index ecd85c3e5..ecd85c3e5 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-si/values-si.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-si/values-si.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sk/values-sk.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sk/values-sk.xml
index 7e221c2cd..7e221c2cd 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sk/values-sk.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sk/values-sk.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sl/values-sl.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sl/values-sl.xml
index a9267347a..a9267347a 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sl/values-sl.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sl/values-sl.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sq/values-sq.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sq/values-sq.xml
index 0dc40eae4..0dc40eae4 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sq/values-sq.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sq/values-sq.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sr/values-sr.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sr/values-sr.xml
index 548d4722c..548d4722c 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sr/values-sr.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sr/values-sr.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sv/values-sv.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sv/values-sv.xml
index 6c8500ce7..6c8500ce7 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sv/values-sv.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sv/values-sv.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw/values-sw.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw/values-sw.xml
index cc59b94b9..cc59b94b9 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw/values-sw.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw/values-sw.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw600dp-v13/values-sw600dp-v13.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw600dp-v13/values-sw600dp-v13.xml
index be7c95f3d..be7c95f3d 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw600dp-v13/values-sw600dp-v13.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw600dp-v13/values-sw600dp-v13.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ta/values-ta.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ta/values-ta.xml
index fd1fabfea..fd1fabfea 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ta/values-ta.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ta/values-ta.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-te/values-te.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-te/values-te.xml
index 7e9888d77..7e9888d77 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-te/values-te.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-te/values-te.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-th/values-th.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-th/values-th.xml
index 2570a3eae..2570a3eae 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-th/values-th.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-th/values-th.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tl/values-tl.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tl/values-tl.xml
index 591cffd13..591cffd13 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tl/values-tl.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tl/values-tl.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tr/values-tr.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tr/values-tr.xml
index 6fe1f8fc6..6fe1f8fc6 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tr/values-tr.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tr/values-tr.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uk/values-uk.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uk/values-uk.xml
index 73718ca48..73718ca48 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uk/values-uk.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uk/values-uk.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ur/values-ur.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ur/values-ur.xml
index 2c8a2fe18..2c8a2fe18 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ur/values-ur.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ur/values-ur.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uz/values-uz.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uz/values-uz.xml
index 644683613..644683613 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uz/values-uz.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uz/values-uz.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v11/values-v11.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v11/values-v11.xml
index 56f5c9d15..56f5c9d15 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v11/values-v11.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v11/values-v11.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v12/values-v12.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v12/values-v12.xml
index 85e241664..85e241664 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v12/values-v12.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v12/values-v12.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v13/values-v13.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v13/values-v13.xml
index 74d14088e..74d14088e 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v13/values-v13.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v13/values-v13.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v14/values-v14.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v14/values-v14.xml
index ea24d5360..ea24d5360 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v14/values-v14.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v14/values-v14.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v16/values-v16.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v16/values-v16.xml
index 5ee2feb23..5ee2feb23 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v16/values-v16.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v16/values-v16.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v17/values-v17.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v17/values-v17.xml
index f9f23d137..f9f23d137 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v17/values-v17.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v17/values-v17.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v18/values-v18.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v18/values-v18.xml
index 7dad77f9e..7dad77f9e 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v18/values-v18.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v18/values-v18.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v21/values-v21.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v21/values-v21.xml
index 00e721f4c..00e721f4c 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v21/values-v21.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v21/values-v21.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v22/values-v22.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v22/values-v22.xml
index d4a514a5f..d4a514a5f 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v22/values-v22.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v22/values-v22.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v23/values-v23.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v23/values-v23.xml
index d807aaeeb..d807aaeeb 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v23/values-v23.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v23/values-v23.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v24/values-v24.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v24/values-v24.xml
index 9649903a3..9649903a3 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v24/values-v24.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v24/values-v24.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v25/values-v25.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v25/values-v25.xml
index 483ae0c46..483ae0c46 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v25/values-v25.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v25/values-v25.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v26/values-v26.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v26/values-v26.xml
index 8b28a4651..8b28a4651 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v26/values-v26.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v26/values-v26.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-vi/values-vi.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-vi/values-vi.xml
index 5bf19364c..5bf19364c 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-vi/values-vi.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-vi/values-vi.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml
index b499d2cf3..b499d2cf3 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
index 3c7682936..3c7682936 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rHK/values-zh-rHK.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rHK/values-zh-rHK.xml
index ce0a0d37c..ce0a0d37c 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rHK/values-zh-rHK.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rHK/values-zh-rHK.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
index 4d7b05bdd..4d7b05bdd 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zu/values-zu.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zu/values-zu.xml
index 679d22f5e..679d22f5e 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zu/values-zu.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zu/values-zu.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values/values.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values/values.xml
index 937e46b56..937e46b56 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values/values.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values/values.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
index d9adae3a0..d9adae3a0 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
index 4733a2aaa..4733a2aaa 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml
index b1ca27c35..b1ca27c35 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml
diff --git a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/packageDebugResources/merger.xml b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/packageDebugResources/merger.xml
index ec6a548d9..ec6a548d9 100644
--- a/Software/Android_Studio/Tango.BL/build/intermediates/incremental/packageDebugResources/merger.xml
+++ b/Software/Android_Studio/Tango/Tango.BL/build/intermediates/incremental/packageDebugResources/merger.xml
diff --git a/Software/Android_Studio/Tango.DAL/.gitignore b/Software/Android_Studio/Tango/Tango.Core/.gitignore
index 796b96d1c..796b96d1c 100644
--- a/Software/Android_Studio/Tango.DAL/.gitignore
+++ b/Software/Android_Studio/Tango/Tango.Core/.gitignore
diff --git a/Software/Android_Studio/Tango.Core/build.gradle b/Software/Android_Studio/Tango/Tango.Core/build.gradle
index 036e02ac5..036e02ac5 100644
--- a/Software/Android_Studio/Tango.Core/build.gradle
+++ b/Software/Android_Studio/Tango/Tango.Core/build.gradle
diff --git a/Software/Android_Studio/Tango.Core/proguard-rules.pro b/Software/Android_Studio/Tango/Tango.Core/proguard-rules.pro
index a0eef131a..a0eef131a 100644
--- a/Software/Android_Studio/Tango.Core/proguard-rules.pro
+++ b/Software/Android_Studio/Tango/Tango.Core/proguard-rules.pro
diff --git a/Software/Android_Studio/Tango.Core/src/main/AndroidManifest.xml b/Software/Android_Studio/Tango/Tango.Core/src/main/AndroidManifest.xml
index ac8559e1a..ac8559e1a 100644
--- a/Software/Android_Studio/Tango.Core/src/main/AndroidManifest.xml
+++ b/Software/Android_Studio/Tango/Tango.Core/src/main/AndroidManifest.xml
diff --git a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/ContextHelper.java b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/ContextHelper.java
index 59151f896..59151f896 100644
--- a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/ContextHelper.java
+++ b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/ContextHelper.java
diff --git a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/DescriptionAnnotation.java b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/DescriptionAnnotation.java
index 31c0e587a..31c0e587a 100644
--- a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/DescriptionAnnotation.java
+++ b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/DescriptionAnnotation.java
diff --git a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/Event.java b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/Event.java
index 74c94c067..74c94c067 100644
--- a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/Event.java
+++ b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/Event.java
diff --git a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/ExtendedObject.java b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/ExtendedObject.java
index 5a7b50d79..5a7b50d79 100644
--- a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/ExtendedObject.java
+++ b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/ExtendedObject.java
diff --git a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/Func.java b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/Func.java
index a0df10ed6..a0df10ed6 100644
--- a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/Func.java
+++ b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/Func.java
diff --git a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/IAction.java b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/IAction.java
index 94a16da40..94a16da40 100644
--- a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/IAction.java
+++ b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/IAction.java
diff --git a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/IAction1.java b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/IAction1.java
index 51770d087..51770d087 100644
--- a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/IAction1.java
+++ b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/IAction1.java
diff --git a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/IDisposable.java b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/IDisposable.java
index 109f4e23b..109f4e23b 100644
--- a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/IDisposable.java
+++ b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/IDisposable.java
diff --git a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/IEventHandler.java b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/IEventHandler.java
index 388e0d3ae..388e0d3ae 100644
--- a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/IEventHandler.java
+++ b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/IEventHandler.java
diff --git a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/ObjectDisposedException.java b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/ObjectDisposedException.java
index d3995e7b2..d3995e7b2 100644
--- a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/ObjectDisposedException.java
+++ b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/ObjectDisposedException.java
diff --git a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/ObservableCollection.java b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/ObservableCollection.java
index cb5bfcb9f..cb5bfcb9f 100644
--- a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/ObservableCollection.java
+++ b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/ObservableCollection.java
diff --git a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/ReflectionsHelper.java b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/ReflectionsHelper.java
index efa8c70a3..efa8c70a3 100644
--- a/Software/Android_Studio/Tango.Core/src/main/java/com/twine/tango/core/ReflectionsHelper.java
+++ b/Software/Android_Studio/Tango/Tango.Core/src/main/java/com/twine/tango/core/ReflectionsHelper.java
diff --git a/Software/Android_Studio/Tango.Core/src/main/res/values/strings.xml b/Software/Android_Studio/Tango/Tango.Core/src/main/res/values/strings.xml
index fd639f5b6..fd639f5b6 100644
--- a/Software/Android_Studio/Tango.Core/src/main/res/values/strings.xml
+++ b/Software/Android_Studio/Tango/Tango.Core/src/main/res/values/strings.xml
diff --git a/Software/Android_Studio/Tango.Integration/.gitignore b/Software/Android_Studio/Tango/Tango.DAL/.gitignore
index 796b96d1c..796b96d1c 100644
--- a/Software/Android_Studio/Tango.Integration/.gitignore
+++ b/Software/Android_Studio/Tango/Tango.DAL/.gitignore
diff --git a/Software/Android_Studio/Tango.DAL/build.gradle b/Software/Android_Studio/Tango/Tango.DAL/build.gradle
index d3a5ac889..d3a5ac889 100644
--- a/Software/Android_Studio/Tango.DAL/build.gradle
+++ b/Software/Android_Studio/Tango/Tango.DAL/build.gradle
diff --git a/Software/Android_Studio/Tango.DAL/proguard-rules.pro b/Software/Android_Studio/Tango/Tango.DAL/proguard-rules.pro
index a0eef131a..a0eef131a 100644
--- a/Software/Android_Studio/Tango.DAL/proguard-rules.pro
+++ b/Software/Android_Studio/Tango/Tango.DAL/proguard-rules.pro
diff --git a/Software/Android_Studio/Tango.DAL/src/main/AndroidManifest.xml b/Software/Android_Studio/Tango/Tango.DAL/src/main/AndroidManifest.xml
index 27f6bf1a0..27f6bf1a0 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/AndroidManifest.xml
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/AndroidManifest.xml
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/DateConverter.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/DateConverter.java
index 548b1dd09..548b1dd09 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/DateConverter.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/DateConverter.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java
index 00cb546f1..00cb546f1 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/TangoDB.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/TangoDB.java
index cdbaab1bb..cdbaab1bb 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/TangoDB.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/TangoDB.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java
index c74625a72..c74625a72 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java
index 61f306764..61f306764 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionTypeBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionTypeBase.java
index b12024870..b12024870 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionTypeBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionTypeBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java
index 289c4e59d..289c4e59d 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/AddressBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/AddressBase.java
index 63dfa8309..63dfa8309 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/AddressBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/AddressBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java
index 968082ce9..968082ce9 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersionBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersionBase.java
index 5540a43b9..5540a43b9 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersionBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersionBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java
index 26aa6192f..26aa6192f 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersionBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersionBase.java
index b72c2824b..b72c2824b 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersionBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersionBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java
index 9bf8c1e08..9bf8c1e08 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersionBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersionBase.java
index 53cf9e864..53cf9e864 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersionBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersionBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java
index b57c511c9..b57c511c9 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersionBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersionBase.java
index f3ae3b9a2..f3ae3b9a2 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersionBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersionBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStop.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStop.java
index ed861bf0f..ed861bf0f 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStop.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStop.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStopBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStopBase.java
index 1e09a088e..1e09a088e 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStopBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStopBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java
index b25fc4e51..b25fc4e51 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeTypeBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeTypeBase.java
index 53ed798c1..53ed798c1 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeTypeBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeTypeBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java
index 78a78022c..78a78022c 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CatBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CatBase.java
index 8d7c0ae3d..8d7c0ae3d 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CatBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CatBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java
index f3a94048a..f3a94048a 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CctBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CctBase.java
index 10d07e209..10d07e209 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CctBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CctBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalog.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalog.java
index 58efc626d..58efc626d 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalog.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalog.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalogBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalogBase.java
index 6fcbd8285..6fcbd8285 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalogBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalogBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpace.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpace.java
index 98fdae627..98fdae627 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpace.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpace.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpaceBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpaceBase.java
index 3b87e7b3a..3b87e7b3a 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpaceBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpaceBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java
index 5553c67e8..5553c67e8 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ConfigurationBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ConfigurationBase.java
index 9a85aaaae..9a85aaaae 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ConfigurationBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ConfigurationBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java
index cad78abe5..cad78abe5 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ContactBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ContactBase.java
index daf4d4483..daf4d4483 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ContactBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ContactBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java
index 62ab942bd..62ab942bd 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserTypeBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserTypeBase.java
index eaf42ba44..eaf42ba44 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserTypeBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserTypeBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java
index ba5b0765c..ba5b0765c 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersionBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersionBase.java
index 96399ca0a..96399ca0a 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersionBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersionBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java
index 493c8020a..493c8020a 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersionBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersionBase.java
index 1f620a844..1f620a844 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersionBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersionBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java
index c91b1c09e..c91b1c09e 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypeBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypeBase.java
index a9d629c52..a9d629c52 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypeBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypeBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java
index a4b992130..a4b992130 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesActionBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesActionBase.java
index f26d3e184..f26d3e184 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesActionBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesActionBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategory.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategory.java
index 9b446812e..9b446812e 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategory.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategory.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategoryBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategoryBase.java
index cd8c5e96f..cd8c5e96f 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategoryBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategoryBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroup.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroup.java
index 05ac72aa9..05ac72aa9 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroup.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroup.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroupBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroupBase.java
index 429ac300c..429ac300c 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroupBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroupBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java
index 185a2fc4a..185a2fc4a 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShapeBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShapeBase.java
index 4b77d1b9d..4b77d1b9d 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShapeBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShapeBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java
index 8bc07151b..8bc07151b 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynthBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynthBase.java
index 5b9ef4df8..5b9ef4df8 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynthBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynthBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancer.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancer.java
index 25167d890..25167d890 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancer.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancer.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerBase.java
index 3f756950f..3f756950f 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerType.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerType.java
index 758dc32d3..758dc32d3 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerType.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerType.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerTypeBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerTypeBase.java
index ef92de00e..ef92de00e 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerTypeBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerTypeBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotor.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotor.java
index 2916aed44..2916aed44 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotor.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotor.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorBase.java
index 86f26b9c1..86f26b9c1 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorType.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorType.java
index 1e1a725de..1e1a725de 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorType.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorType.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorTypeBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorTypeBase.java
index 38a0835fe..38a0835fe 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorTypeBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorTypeBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControl.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControl.java
index 63bc62fdf..63bc62fdf 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControl.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControl.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlBase.java
index a350f51f7..a350f51f7 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlType.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlType.java
index d29f07c56..d29f07c56 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlType.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlType.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlTypeBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlTypeBase.java
index f560be28a..f560be28a 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlTypeBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlTypeBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java
index b6b0f7d8d..b6b0f7d8d 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersionBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersionBase.java
index 0b56818ff..0b56818ff 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersionBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersionBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinder.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinder.java
index 283a13570..283a13570 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinder.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinder.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderBase.java
index 5f951377b..5f951377b 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderType.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderType.java
index 49c3eeaff..49c3eeaff 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderType.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderType.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderTypeBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderTypeBase.java
index 09d2d5ffd..09d2d5ffd 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderTypeBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderTypeBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java
index d12bcd2d0..d12bcd2d0 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackBase.java
index 4552e82c0..4552e82c0 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormula.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormula.java
index 5720b4764..5720b4764 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormula.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormula.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormulaBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormulaBase.java
index f651ac7cd..f651ac7cd 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormulaBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormulaBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Job.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Job.java
index 10df0c9c1..10df0c9c1 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Job.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Job.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobBase.java
index b2c001db3..b2c001db3 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRun.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRun.java
index 5e2d1c56c..5e2d1c56c 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRun.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRun.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRunBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRunBase.java
index c97f84f8f..c97f84f8f 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRunBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRunBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java
index 475d8beac..475d8beac 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnitBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnitBase.java
index 8179be400..8179be400 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnitBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnitBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java
index fec3c8e78..fec3c8e78 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypeBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypeBase.java
index 0ab2ec5f3..0ab2ec5f3 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypeBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypeBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java
index 65ea0b02e..65ea0b02e 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRmlBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRmlBase.java
index 531537360..531537360 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRmlBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRmlBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java
index 162416be5..162416be5 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineBase.java
index 05678fbbb..05678fbbb 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersion.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersion.java
index 903a3e5ff..903a3e5ff 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersion.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersion.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersionBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersionBase.java
index 206f597a6..206f597a6 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersionBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersionBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java
index 77d866ec3..77d866ec3 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersionBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersionBase.java
index bc0da03e5..bc0da03e5 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersionBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersionBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java
index c43629185..c43629185 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfigurationBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfigurationBase.java
index 3f2fab5da..3f2fab5da 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfigurationBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfigurationBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java
index dbb64b499..dbb64b499 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEventBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEventBase.java
index e35e293db..e35e293db 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEventBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEventBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java
index 4c10d49cd..4c10d49cd 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColorBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColorBase.java
index 116ebf2a4..116ebf2a4 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColorBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColorBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java
index 5652028eb..5652028eb 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaConditionBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaConditionBase.java
index f4aa62c8b..f4aa62c8b 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaConditionBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaConditionBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java
index b40c543c8..b40c543c8 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterialBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterialBase.java
index b429f00c9..b429f00c9 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterialBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterialBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java
index 086046e00..086046e00 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurposeBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurposeBase.java
index 0113bd234..0113bd234 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurposeBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurposeBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java
index 387c70784..387c70784 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankTypeBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankTypeBase.java
index 5aaf29aee..5aaf29aee 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankTypeBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankTypeBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Organization.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Organization.java
index 50ccd7ecb..50ccd7ecb 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Organization.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Organization.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/OrganizationBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/OrganizationBase.java
index f58b9141f..f58b9141f 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/OrganizationBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/OrganizationBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java
index efb19c8fd..efb19c8fd 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/PermissionBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/PermissionBase.java
index ecb650388..ecb650388 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/PermissionBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/PermissionBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTable.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTable.java
index 4284ab4d3..4284ab4d3 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTable.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTable.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTableBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTableBase.java
index a1ad71938..a1ad71938 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTableBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTableBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroup.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroup.java
index 4652a0b1f..4652a0b1f 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroup.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroup.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroupBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroupBase.java
index c7c9c561e..c7c9c561e 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroupBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroupBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java
index f22a991bb..f22a991bb 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RmlBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RmlBase.java
index f3c24d0ae..f3c24d0ae 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RmlBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RmlBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java
index a2388367b..a2388367b 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RoleBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RoleBase.java
index 8101489e1..8101489e1 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RoleBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RoleBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java
index 238a3461b..238a3461b 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermissionBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermissionBase.java
index 83042af4e..83042af4e 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermissionBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermissionBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Segment.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Segment.java
index a11367722..a11367722 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Segment.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Segment.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SegmentBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SegmentBase.java
index b917cea2a..b917cea2a 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SegmentBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SegmentBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolType.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolType.java
index b9cb5520e..b9cb5520e 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolType.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolType.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolTypeBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolTypeBase.java
index c0f9cd0c3..c0f9cd0c3 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolTypeBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolTypeBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java
index 6dfb752be..6dfb752be 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfigurationBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfigurationBase.java
index 3e8428983..3e8428983 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfigurationBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfigurationBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechController.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechController.java
index fb29cab06..fb29cab06 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechController.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechController.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechControllerBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechControllerBase.java
index 367f7c11e..367f7c11e 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechControllerBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechControllerBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenser.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenser.java
index ac66c7b2c..ac66c7b2c 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenser.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenser.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenserBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenserBase.java
index 839e29f2b..839e29f2b 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenserBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenserBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIo.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIo.java
index ba1809bd3..ba1809bd3 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIo.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIo.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIoBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIoBase.java
index 38581baeb..38581baeb 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIoBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIoBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitor.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitor.java
index 5324cdd6d..5324cdd6d 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitor.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitor.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitorBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitorBase.java
index 921caf4b7..921caf4b7 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitorBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitorBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotor.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotor.java
index 0dd2fe139..0dd2fe139 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotor.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotor.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotorBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotorBase.java
index f56865c88..f56865c88 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotorBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotorBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValf.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValf.java
index 8b577e74c..8b577e74c 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValf.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValf.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValfBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValfBase.java
index 40e726e7a..40e726e7a 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValfBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValfBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java
index 11f23f1e2..11f23f1e2 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UserBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UserBase.java
index d2f741dec..d2f741dec 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UserBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UserBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java
index 4846c6f74..4846c6f74 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRoleBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRoleBase.java
index 20025896f..20025896f 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRoleBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRoleBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethod.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethod.java
index 92a0ed10f..92a0ed10f 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethod.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethod.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethodBase.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethodBase.java
index 08a35c7fa..08a35c7fa 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethodBase.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethodBase.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ActionTypes.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ActionTypes.java
index 5677a84c7..5677a84c7 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ActionTypes.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ActionTypes.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/CartridgeTypes.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/CartridgeTypes.java
index 7be6a56e6..7be6a56e6 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/CartridgeTypes.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/CartridgeTypes.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ColorSpaces.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ColorSpaces.java
index 75985ebd6..75985ebd6 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ColorSpaces.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ColorSpaces.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/DispenserTypes.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/DispenserTypes.java
index 0bca3db74..0bca3db74 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/DispenserTypes.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/DispenserTypes.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EnumDemo.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EnumDemo.java
index a92d6aefa..a92d6aefa 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EnumDemo.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EnumDemo.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypes.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypes.java
index f23db3fa1..f23db3fa1 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypes.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypes.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypesCategories.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypesCategories.java
index 4395e4ed6..4395e4ed6 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypesCategories.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypesCategories.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypesGroups.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypesGroups.java
index 1fe1780d9..1fe1780d9 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypesGroups.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypesGroups.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberShapes.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberShapes.java
index 10411d66a..10411d66a 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberShapes.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberShapes.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberSynths.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberSynths.java
index 03f2f950b..03f2f950b 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberSynths.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberSynths.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareDancerTypes.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareDancerTypes.java
index 8a5107a3a..8a5107a3a 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareDancerTypes.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareDancerTypes.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareMotorTypes.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareMotorTypes.java
index 76df00013..76df00013 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareMotorTypes.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareMotorTypes.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwarePidControlTypes.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwarePidControlTypes.java
index 45a372f01..45a372f01 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwarePidControlTypes.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwarePidControlTypes.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareWinderTypes.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareWinderTypes.java
index c8795ff0c..c8795ff0c 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareWinderTypes.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/HardwareWinderTypes.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/IdsPackFormulas.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/IdsPackFormulas.java
index d38206396..d38206396 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/IdsPackFormulas.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/IdsPackFormulas.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LinearMassDensityUnits.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LinearMassDensityUnits.java
index 1cc561b63..1cc561b63 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LinearMassDensityUnits.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LinearMassDensityUnits.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LiquidTypes.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LiquidTypes.java
index 7a6187d31..7a6187d31 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LiquidTypes.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LiquidTypes.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaConditions.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaConditions.java
index b083f111a..b083f111a 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaConditions.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaConditions.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaMaterials.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaMaterials.java
index 87c8313a9..87c8313a9 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaMaterials.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaMaterials.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaPurposes.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaPurposes.java
index ac68e56df..ac68e56df 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaPurposes.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaPurposes.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MidTankTypes.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MidTankTypes.java
index a1122db40..a1122db40 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MidTankTypes.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MidTankTypes.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Permissions.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Permissions.java
index 5a5ef1f06..5a5ef1f06 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Permissions.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Permissions.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Rmls.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Rmls.java
index ea256b2bd..ea256b2bd 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Rmls.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Rmls.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Roles.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Roles.java
index 3d0566347..3d0566347 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Roles.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Roles.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/SpoolTypes.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/SpoolTypes.java
index 93711f341..93711f341 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/SpoolTypes.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/SpoolTypes.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechControllers.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechControllers.java
index f7ebc29be..f7ebc29be 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechControllers.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechControllers.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechDispensers.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechDispensers.java
index 14b6464d9..14b6464d9 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechDispensers.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechDispensers.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechIos.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechIos.java
index f228b1cbd..f228b1cbd 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechIos.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechIos.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechMonitors.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechMonitors.java
index b5279426e..b5279426e 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechMonitors.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechMonitors.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechMotors.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechMotors.java
index 128561d53..128561d53 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechMotors.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechMotors.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechValves.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechValves.java
index 7ef2fe78f..7ef2fe78f 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechValves.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/TechValves.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/WindingMethods.java b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/WindingMethods.java
index b6c322759..b6c322759 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/WindingMethods.java
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/WindingMethods.java
diff --git a/Software/Android_Studio/Tango.DAL/src/main/res/raw/tangodb b/Software/Android_Studio/Tango/Tango.DAL/src/main/res/raw/tangodb
index 336f96dcf..336f96dcf 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/res/raw/tangodb
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/res/raw/tangodb
diff --git a/Software/Android_Studio/Tango.DAL/src/main/res/values/strings.xml b/Software/Android_Studio/Tango/Tango.DAL/src/main/res/values/strings.xml
index 281f85fbb..281f85fbb 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/res/values/strings.xml
+++ b/Software/Android_Studio/Tango/Tango.DAL/src/main/res/values/strings.xml
diff --git a/Software/Android_Studio/Tango.Logging/.gitignore b/Software/Android_Studio/Tango/Tango.Integration/.gitignore
index 796b96d1c..796b96d1c 100644
--- a/Software/Android_Studio/Tango.Logging/.gitignore
+++ b/Software/Android_Studio/Tango/Tango.Integration/.gitignore
diff --git a/Software/Android_Studio/Tango.Integration/build.gradle b/Software/Android_Studio/Tango/Tango.Integration/build.gradle
index ba8a3f663..ba8a3f663 100644
--- a/Software/Android_Studio/Tango.Integration/build.gradle
+++ b/Software/Android_Studio/Tango/Tango.Integration/build.gradle
diff --git a/Software/Android_Studio/Tango.Integration/proguard-rules.pro b/Software/Android_Studio/Tango/Tango.Integration/proguard-rules.pro
index a0eef131a..a0eef131a 100644
--- a/Software/Android_Studio/Tango.Integration/proguard-rules.pro
+++ b/Software/Android_Studio/Tango/Tango.Integration/proguard-rules.pro
diff --git a/Software/Android_Studio/Tango.Integration/src/main/AndroidManifest.xml b/Software/Android_Studio/Tango/Tango.Integration/src/main/AndroidManifest.xml
index 81958ad3d..81958ad3d 100644
--- a/Software/Android_Studio/Tango.Integration/src/main/AndroidManifest.xml
+++ b/Software/Android_Studio/Tango/Tango.Integration/src/main/AndroidManifest.xml
diff --git a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/operators/IMachineOperator.java b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/operators/IMachineOperator.java
index 9963f295b..9963f295b 100644
--- a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/operators/IMachineOperator.java
+++ b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/operators/IMachineOperator.java
diff --git a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/operators/MachineOperator.java b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/operators/MachineOperator.java
index c690435f9..c690435f9 100644
--- a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/operators/MachineOperator.java
+++ b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/operators/MachineOperator.java
diff --git a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/providers/IMachineIdentityProvider.java b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/providers/IMachineIdentityProvider.java
index 547a17e50..547a17e50 100644
--- a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/providers/IMachineIdentityProvider.java
+++ b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/providers/IMachineIdentityProvider.java
diff --git a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/providers/MachineIdentityProvider.java b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/providers/MachineIdentityProvider.java
index c72b9cea4..c72b9cea4 100644
--- a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/providers/MachineIdentityProvider.java
+++ b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/providers/MachineIdentityProvider.java
diff --git a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java
index aea082d05..aea082d05 100644
--- a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java
+++ b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java
diff --git a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/IExternalBridgeService.java b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/services/IExternalBridgeService.java
index 5a2aed9aa..5a2aed9aa 100644
--- a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/IExternalBridgeService.java
+++ b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/services/IExternalBridgeService.java
diff --git a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ISynchronizationService.java b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/services/ISynchronizationService.java
index 631522fd0..631522fd0 100644
--- a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ISynchronizationService.java
+++ b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/services/ISynchronizationService.java
diff --git a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/SynchronizationService.java b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/services/SynchronizationService.java
index d8423cf22..d8423cf22 100644
--- a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/SynchronizationService.java
+++ b/Software/Android_Studio/Tango/Tango.Integration/src/main/java/com/twine/tango/integration/services/SynchronizationService.java
diff --git a/Software/Android_Studio/Tango.Integration/src/main/res/values/strings.xml b/Software/Android_Studio/Tango/Tango.Integration/src/main/res/values/strings.xml
index 58ea29ec7..58ea29ec7 100644
--- a/Software/Android_Studio/Tango.Integration/src/main/res/values/strings.xml
+++ b/Software/Android_Studio/Tango/Tango.Integration/src/main/res/values/strings.xml
diff --git a/Software/Android_Studio/Tango.Models/.gitignore b/Software/Android_Studio/Tango/Tango.Logging/.gitignore
index 796b96d1c..796b96d1c 100644
--- a/Software/Android_Studio/Tango.Models/.gitignore
+++ b/Software/Android_Studio/Tango/Tango.Logging/.gitignore
diff --git a/Software/Android_Studio/Tango.Logging/build.gradle b/Software/Android_Studio/Tango/Tango.Logging/build.gradle
index 724faea79..724faea79 100644
--- a/Software/Android_Studio/Tango.Logging/build.gradle
+++ b/Software/Android_Studio/Tango/Tango.Logging/build.gradle
diff --git a/Software/Android_Studio/Tango.Logging/proguard-rules.pro b/Software/Android_Studio/Tango/Tango.Logging/proguard-rules.pro
index a0eef131a..a0eef131a 100644
--- a/Software/Android_Studio/Tango.Logging/proguard-rules.pro
+++ b/Software/Android_Studio/Tango/Tango.Logging/proguard-rules.pro
diff --git a/Software/Android_Studio/Tango.Logging/src/main/AndroidManifest.xml b/Software/Android_Studio/Tango/Tango.Logging/src/main/AndroidManifest.xml
index e88be285a..e88be285a 100644
--- a/Software/Android_Studio/Tango.Logging/src/main/AndroidManifest.xml
+++ b/Software/Android_Studio/Tango/Tango.Logging/src/main/AndroidManifest.xml
diff --git a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/ExceptionLogItem.java b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/ExceptionLogItem.java
index 49aa1b687..49aa1b687 100644
--- a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/ExceptionLogItem.java
+++ b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/ExceptionLogItem.java
diff --git a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/FileLogger.java b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/FileLogger.java
index 50b6b27b6..50b6b27b6 100644
--- a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/FileLogger.java
+++ b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/FileLogger.java
diff --git a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/ILogger.java b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/ILogger.java
index a6ddf1dfc..a6ddf1dfc 100644
--- a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/ILogger.java
+++ b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/ILogger.java
diff --git a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/LogCatLogger.java b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/LogCatLogger.java
index e394503e1..e394503e1 100644
--- a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/LogCatLogger.java
+++ b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/LogCatLogger.java
diff --git a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/LogCategory.java b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/LogCategory.java
index 5ce2c521e..5ce2c521e 100644
--- a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/LogCategory.java
+++ b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/LogCategory.java
diff --git a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/LogItem.java b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/LogItem.java
index deaeb3084..deaeb3084 100644
--- a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/LogItem.java
+++ b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/LogItem.java
diff --git a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/LogManager.java b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/LogManager.java
index b2a199f22..b2a199f22 100644
--- a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/LogManager.java
+++ b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/LogManager.java
diff --git a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/MessageLogItem.java b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/MessageLogItem.java
index cf7c7ab48..cf7c7ab48 100644
--- a/Software/Android_Studio/Tango.Logging/src/main/java/com/twine/tango/logging/MessageLogItem.java
+++ b/Software/Android_Studio/Tango/Tango.Logging/src/main/java/com/twine/tango/logging/MessageLogItem.java
diff --git a/Software/Android_Studio/Tango.Logging/src/main/res/values/strings.xml b/Software/Android_Studio/Tango/Tango.Logging/src/main/res/values/strings.xml
index 0562bdaf2..0562bdaf2 100644
--- a/Software/Android_Studio/Tango.Logging/src/main/res/values/strings.xml
+++ b/Software/Android_Studio/Tango/Tango.Logging/src/main/res/values/strings.xml
diff --git a/Software/Android_Studio/Tango.NativeBridge/.gitignore b/Software/Android_Studio/Tango/Tango.Models/.gitignore
index 796b96d1c..796b96d1c 100644
--- a/Software/Android_Studio/Tango.NativeBridge/.gitignore
+++ b/Software/Android_Studio/Tango/Tango.Models/.gitignore
diff --git a/Software/Android_Studio/Tango.Models/build.gradle b/Software/Android_Studio/Tango/Tango.Models/build.gradle
index 127943df7..127943df7 100644
--- a/Software/Android_Studio/Tango.Models/build.gradle
+++ b/Software/Android_Studio/Tango/Tango.Models/build.gradle
diff --git a/Software/Android_Studio/Tango.Models/proguard-rules.pro b/Software/Android_Studio/Tango/Tango.Models/proguard-rules.pro
index a0eef131a..a0eef131a 100644
--- a/Software/Android_Studio/Tango.Models/proguard-rules.pro
+++ b/Software/Android_Studio/Tango/Tango.Models/proguard-rules.pro
diff --git a/Software/Android_Studio/Tango.Models/src/main/AndroidManifest.xml b/Software/Android_Studio/Tango/Tango.Models/src/main/AndroidManifest.xml
index 85096ec75..85096ec75 100644
--- a/Software/Android_Studio/Tango.Models/src/main/AndroidManifest.xml
+++ b/Software/Android_Studio/Tango/Tango.Models/src/main/AndroidManifest.xml
diff --git a/Software/Android_Studio/Tango.Models/src/main/java/com/twine/tango/models/User.java b/Software/Android_Studio/Tango/Tango.Models/src/main/java/com/twine/tango/models/User.java
index 41ea672e4..41ea672e4 100644
--- a/Software/Android_Studio/Tango.Models/src/main/java/com/twine/tango/models/User.java
+++ b/Software/Android_Studio/Tango/Tango.Models/src/main/java/com/twine/tango/models/User.java
diff --git a/Software/Android_Studio/Tango.Models/src/main/res/values/strings.xml b/Software/Android_Studio/Tango/Tango.Models/src/main/res/values/strings.xml
index 8caa8d0fd..8caa8d0fd 100644
--- a/Software/Android_Studio/Tango.Models/src/main/res/values/strings.xml
+++ b/Software/Android_Studio/Tango/Tango.Models/src/main/res/values/strings.xml
diff --git a/Software/Android_Studio/Tango.PMR/.gitignore b/Software/Android_Studio/Tango/Tango.NativeBridge/.gitignore
index 796b96d1c..796b96d1c 100644
--- a/Software/Android_Studio/Tango.PMR/.gitignore
+++ b/Software/Android_Studio/Tango/Tango.NativeBridge/.gitignore
diff --git a/Software/Android_Studio/Tango.NativeBridge/CMakeLists.txt b/Software/Android_Studio/Tango/Tango.NativeBridge/CMakeLists.txt
index 4e56698ac..4e56698ac 100644
--- a/Software/Android_Studio/Tango.NativeBridge/CMakeLists.txt
+++ b/Software/Android_Studio/Tango/Tango.NativeBridge/CMakeLists.txt
diff --git a/Software/Android_Studio/Tango.NativeBridge/build.gradle b/Software/Android_Studio/Tango/Tango.NativeBridge/build.gradle
index e14a0edf0..e14a0edf0 100644
--- a/Software/Android_Studio/Tango.NativeBridge/build.gradle
+++ b/Software/Android_Studio/Tango/Tango.NativeBridge/build.gradle
diff --git a/Software/Android_Studio/Tango.NativeBridge/libs/armeabi-v7a/tangoColorLib.so b/Software/Android_Studio/Tango/Tango.NativeBridge/libs/armeabi-v7a/tangoColorLib.so
index a0d0b4f83..a0d0b4f83 100644
--- a/Software/Android_Studio/Tango.NativeBridge/libs/armeabi-v7a/tangoColorLib.so
+++ b/Software/Android_Studio/Tango/Tango.NativeBridge/libs/armeabi-v7a/tangoColorLib.so
diff --git a/Software/Android_Studio/Tango.NativeBridge/libs/armeabi-v7a/tangoColorLib.so.recipe b/Software/Android_Studio/Tango/Tango.NativeBridge/libs/armeabi-v7a/tangoColorLib.so.recipe
index adae6e576..adae6e576 100644
--- a/Software/Android_Studio/Tango.NativeBridge/libs/armeabi-v7a/tangoColorLib.so.recipe
+++ b/Software/Android_Studio/Tango/Tango.NativeBridge/libs/armeabi-v7a/tangoColorLib.so.recipe
diff --git a/Software/Android_Studio/Tango.NativeBridge/libs/x86_64/tangoColorLib.so b/Software/Android_Studio/Tango/Tango.NativeBridge/libs/x86_64/tangoColorLib.so
index 1abe6e4cc..1abe6e4cc 100644
--- a/Software/Android_Studio/Tango.NativeBridge/libs/x86_64/tangoColorLib.so
+++ b/Software/Android_Studio/Tango/Tango.NativeBridge/libs/x86_64/tangoColorLib.so
diff --git a/Software/Android_Studio/Tango.NativeBridge/libs/x86_64/tangoColorLib.so.recipe b/Software/Android_Studio/Tango/Tango.NativeBridge/libs/x86_64/tangoColorLib.so.recipe
index 42edb070a..42edb070a 100644
--- a/Software/Android_Studio/Tango.NativeBridge/libs/x86_64/tangoColorLib.so.recipe
+++ b/Software/Android_Studio/Tango/Tango.NativeBridge/libs/x86_64/tangoColorLib.so.recipe
diff --git a/Software/Android_Studio/Tango.NativeBridge/proguard-rules.pro b/Software/Android_Studio/Tango/Tango.NativeBridge/proguard-rules.pro
index a0eef131a..a0eef131a 100644
--- a/Software/Android_Studio/Tango.NativeBridge/proguard-rules.pro
+++ b/Software/Android_Studio/Tango/Tango.NativeBridge/proguard-rules.pro
diff --git a/Software/Android_Studio/Tango.NativeBridge/src/main/AndroidManifest.xml b/Software/Android_Studio/Tango/Tango.NativeBridge/src/main/AndroidManifest.xml
index b1fd473cc..b1fd473cc 100644
--- a/Software/Android_Studio/Tango.NativeBridge/src/main/AndroidManifest.xml
+++ b/Software/Android_Studio/Tango/Tango.NativeBridge/src/main/AndroidManifest.xml
diff --git a/Software/Android_Studio/Tango.NativeBridge/src/main/cpp/Android.mk b/Software/Android_Studio/Tango/Tango.NativeBridge/src/main/cpp/Android.mk
index e69de29bb..e69de29bb 100644
--- a/Software/Android_Studio/Tango.NativeBridge/src/main/cpp/Android.mk
+++ b/Software/Android_Studio/Tango/Tango.NativeBridge/src/main/cpp/Android.mk
diff --git a/Software/Android_Studio/Tango.NativeBridge/src/main/cpp/ColorLibAdapter.cpp b/Software/Android_Studio/Tango/Tango.NativeBridge/src/main/cpp/ColorLibAdapter.cpp
index b2c5f3121..b2c5f3121 100644
--- a/Software/Android_Studio/Tango.NativeBridge/src/main/cpp/ColorLibAdapter.cpp
+++ b/Software/Android_Studio/Tango/Tango.NativeBridge/src/main/cpp/ColorLibAdapter.cpp
diff --git a/Software/Android_Studio/Tango.NativeBridge/src/main/java/com/twine/tango/nativebridge/ColorLibAdapter.java b/Software/Android_Studio/Tango/Tango.NativeBridge/src/main/java/com/twine/tango/nativebridge/ColorLibAdapter.java
index 7d0f4539d..7d0f4539d 100644
--- a/Software/Android_Studio/Tango.NativeBridge/src/main/java/com/twine/tango/nativebridge/ColorLibAdapter.java
+++ b/Software/Android_Studio/Tango/Tango.NativeBridge/src/main/java/com/twine/tango/nativebridge/ColorLibAdapter.java
diff --git a/Software/Android_Studio/Tango.NativeBridge/src/main/res/values/strings.xml b/Software/Android_Studio/Tango/Tango.NativeBridge/src/main/res/values/strings.xml
index 3310e131d..3310e131d 100644
--- a/Software/Android_Studio/Tango.NativeBridge/src/main/res/values/strings.xml
+++ b/Software/Android_Studio/Tango/Tango.NativeBridge/src/main/res/values/strings.xml
diff --git a/Software/Android_Studio/Tango.SharedUI/.gitignore b/Software/Android_Studio/Tango/Tango.PMR/.gitignore
index 796b96d1c..796b96d1c 100644
--- a/Software/Android_Studio/Tango.SharedUI/.gitignore
+++ b/Software/Android_Studio/Tango/Tango.PMR/.gitignore
diff --git a/Software/Android_Studio/Tango.PMR/build.gradle b/Software/Android_Studio/Tango/Tango.PMR/build.gradle
index 19f6f810d..19f6f810d 100644
--- a/Software/Android_Studio/Tango.PMR/build.gradle
+++ b/Software/Android_Studio/Tango/Tango.PMR/build.gradle
diff --git a/Software/Android_Studio/Tango.PMR/proguard-rules.pro b/Software/Android_Studio/Tango/Tango.PMR/proguard-rules.pro
index a0eef131a..a0eef131a 100644
--- a/Software/Android_Studio/Tango.PMR/proguard-rules.pro
+++ b/Software/Android_Studio/Tango/Tango.PMR/proguard-rules.pro
diff --git a/Software/Android_Studio/Tango.PMR/src/main/AndroidManifest.xml b/Software/Android_Studio/Tango/Tango.PMR/src/main/AndroidManifest.xml
index aa1bf8a98..aa1bf8a98 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/AndroidManifest.xml
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/AndroidManifest.xml
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/ITangoMessage.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/ITangoMessage.java
index f64411a62..f64411a62 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/ITangoMessage.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/ITangoMessage.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/MessageFactory.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/MessageFactory.java
index 982b5cdb1..982b5cdb1 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/MessageFactory.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/MessageFactory.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/TangoMessage.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/TangoMessage.java
index eaf6de233..eaf6de233 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/TangoMessage.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/TangoMessage.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/CalibrationDataOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/CalibrationDataOuterClass.java
index 8a077419a..8a077419a 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/CalibrationDataOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/CalibrationDataOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/CalibrationPointOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/CalibrationPointOuterClass.java
index 3417bb272..3417bb272 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/CalibrationPointOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/CalibrationPointOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/ColorSpaceOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/ColorSpaceOuterClass.java
index 48256bbe0..48256bbe0 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/ColorSpaceOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/ColorSpaceOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/ConversionInputOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/ConversionInputOuterClass.java
index 9d19e501c..9d19e501c 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/ConversionInputOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/ConversionInputOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/ConversionOutputOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/ConversionOutputOuterClass.java
index dcd0a93c9..dcd0a93c9 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/ConversionOutputOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/ConversionOutputOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/InputCoordinatesOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/InputCoordinatesOuterClass.java
index e66dacc59..e66dacc59 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/InputCoordinatesOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/InputCoordinatesOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/InputLiquidOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/InputLiquidOuterClass.java
index ac3f2b347..ac3f2b347 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/InputLiquidOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/InputLiquidOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/LiquidTypeOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/LiquidTypeOuterClass.java
index e3667ed74..e3667ed74 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/LiquidTypeOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/LiquidTypeOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/OutputCoordinatesOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/OutputCoordinatesOuterClass.java
index f7354549b..f7354549b 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/OutputCoordinatesOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/OutputCoordinatesOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/OutputLiquidOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/OutputLiquidOuterClass.java
index 319cbcfb7..319cbcfb7 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/OutputLiquidOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/colorlab/OutputLiquidOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/ErrorCodeOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/common/ErrorCodeOuterClass.java
index 938147ddf..938147ddf 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/ErrorCodeOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/common/ErrorCodeOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/KeepAliveRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/common/KeepAliveRequestOuterClass.java
index b0bdd88bf..b0bdd88bf 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/KeepAliveRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/common/KeepAliveRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/KeepAliveResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/common/KeepAliveResponseOuterClass.java
index 2a0f6894e..2a0f6894e 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/KeepAliveResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/common/KeepAliveResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageContainerOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageContainerOuterClass.java
index 4dc9d6f6f..4dc9d6f6f 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageContainerOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageContainerOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java
index 3dcc1b236..3dcc1b236 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/debugging/DebugLogCategoryOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/debugging/DebugLogCategoryOuterClass.java
index 24814d4b3..24814d4b3 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/debugging/DebugLogCategoryOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/debugging/DebugLogCategoryOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/debugging/DebugLogRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/debugging/DebugLogRequestOuterClass.java
index 4cfd5b2e6..4cfd5b2e6 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/debugging/DebugLogRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/debugging/DebugLogRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/debugging/DebugLogResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/debugging/DebugLogResponseOuterClass.java
index 3c56b4966..3c56b4966 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/debugging/DebugLogResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/debugging/DebugLogResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DataFileFrameOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DataFileFrameOuterClass.java
index dc624902e..dc624902e 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DataFileFrameOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DataFileFrameOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DiagnosticsMonitorsOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DiagnosticsMonitorsOuterClass.java
index 0d3e3d4e4..0d3e3d4e4 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DiagnosticsMonitorsOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DiagnosticsMonitorsOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DigitalPinOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DigitalPinOuterClass.java
index 1b8f966c7..1b8f966c7 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DigitalPinOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DigitalPinOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortHomingRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortHomingRequestOuterClass.java
index 76115e396..76115e396 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortHomingRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortHomingRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortHomingResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortHomingResponseOuterClass.java
index 33244621a..33244621a 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortHomingResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortHomingResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortJoggingRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortJoggingRequestOuterClass.java
index d9b6e838d..d9b6e838d 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortJoggingRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortJoggingRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortJoggingResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortJoggingResponseOuterClass.java
index 1e1276da4..1e1276da4 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortJoggingResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserAbortJoggingResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserHomingRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserHomingRequestOuterClass.java
index 8c1c69986..8c1c69986 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserHomingRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserHomingRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserHomingResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserHomingResponseOuterClass.java
index 044efe996..044efe996 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserHomingResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserHomingResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserJoggingRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserJoggingRequestOuterClass.java
index c12b8c6b4..c12b8c6b4 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserJoggingRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserJoggingRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserJoggingResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserJoggingResponseOuterClass.java
index 239796c0b..239796c0b 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserJoggingResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DispenserJoggingResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DoubleArrayOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DoubleArrayOuterClass.java
index 491db60b0..491db60b0 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DoubleArrayOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/DoubleArrayOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/EventOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/EventOuterClass.java
index d1753f626..d1753f626 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/EventOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/EventOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/EventTypeOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/EventTypeOuterClass.java
index be799e217..be799e217 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/EventTypeOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/EventTypeOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortHomingRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortHomingRequestOuterClass.java
index 2268095b5..2268095b5 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortHomingRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortHomingRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortHomingResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortHomingResponseOuterClass.java
index 8cce2a586..8cce2a586 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortHomingResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortHomingResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortJoggingRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortJoggingRequestOuterClass.java
index 11a24c3aa..11a24c3aa 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortJoggingRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortJoggingRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortJoggingResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortJoggingResponseOuterClass.java
index 8e89e6fbe..8e89e6fbe 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortJoggingResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorAbortJoggingResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorDirectionOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorDirectionOuterClass.java
index c11600f28..c11600f28 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorDirectionOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorDirectionOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorHomingRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorHomingRequestOuterClass.java
index 930f2f694..930f2f694 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorHomingRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorHomingRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorHomingResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorHomingResponseOuterClass.java
index cb36100e2..cb36100e2 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorHomingResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorHomingResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorJoggingRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorJoggingRequestOuterClass.java
index 539aa27e4..539aa27e4 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorJoggingRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorJoggingRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorJoggingResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorJoggingResponseOuterClass.java
index c85a24181..c85a24181 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorJoggingResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/MotorJoggingResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/PushDiagnosticsRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/PushDiagnosticsRequestOuterClass.java
index 3642252d2..3642252d2 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/PushDiagnosticsRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/PushDiagnosticsRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/PushDiagnosticsResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/PushDiagnosticsResponseOuterClass.java
index 5ff61a9e2..5ff61a9e2 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/PushDiagnosticsResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/PushDiagnosticsResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetComponentValueRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetComponentValueRequestOuterClass.java
index 38b45f468..38b45f468 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetComponentValueRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetComponentValueRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetComponentValueResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetComponentValueResponseOuterClass.java
index a2d5e81d4..a2d5e81d4 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetComponentValueResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetComponentValueResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetDigitalOutRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetDigitalOutRequestOuterClass.java
index 512a76a72..512a76a72 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetDigitalOutRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetDigitalOutRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetDigitalOutResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetDigitalOutResponseOuterClass.java
index a9c7145f0..a9c7145f0 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetDigitalOutResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/SetDigitalOutResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadAbortJoggingRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadAbortJoggingRequestOuterClass.java
index d77fe299a..d77fe299a 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadAbortJoggingRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadAbortJoggingRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadAbortJoggingResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadAbortJoggingResponseOuterClass.java
index 70edde1cc..70edde1cc 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadAbortJoggingResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadAbortJoggingResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadJoggingRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadJoggingRequestOuterClass.java
index 1b6711b8d..1b6711b8d 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadJoggingRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadJoggingRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadJoggingResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadJoggingResponseOuterClass.java
index 94a7ccde6..94a7ccde6 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadJoggingResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ThreadJoggingResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ValueComponentOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ValueComponentOuterClass.java
index 18a157859..18a157859 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ValueComponentOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ValueComponentOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ValueComponentStateOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ValueComponentStateOuterClass.java
index b85bddbb3..b85bddbb3 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ValueComponentStateOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/ValueComponentStateOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/AnalyzeInputOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/AnalyzeInputOuterClass.java
index c06cdea31..c06cdea31 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/AnalyzeInputOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/AnalyzeInputOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/AnalyzeOutputOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/AnalyzeOutputOuterClass.java
index ded14ad0e..ded14ad0e 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/AnalyzeOutputOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/AnalyzeOutputOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/ConvertFileInputOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/ConvertFileInputOuterClass.java
index daf4a8b10..daf4a8b10 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/ConvertFileInputOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/ConvertFileInputOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/ConvertFileOutputOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/ConvertFileOutputOuterClass.java
index 6d4e99f46..6d4e99f46 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/ConvertFileOutputOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/ConvertFileOutputOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/EmbroideryFileOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/EmbroideryFileOuterClass.java
index 560fcad36..560fcad36 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/EmbroideryFileOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/EmbroideryFileOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/ExtentsOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/ExtentsOuterClass.java
index d85c998f2..d85c998f2 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/ExtentsOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/ExtentsOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/StitchColorOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/StitchColorOuterClass.java
index 23b03dd27..23b03dd27 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/StitchColorOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/StitchColorOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/StitchFlagOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/StitchFlagOuterClass.java
index c9f1bc741..c9f1bc741 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/StitchFlagOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/StitchFlagOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/StitchOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/StitchOuterClass.java
index b995009c3..b995009c3 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/StitchOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/embroidery/StitchOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareConfigurationOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareConfigurationOuterClass.java
index 66659f82e..66659f82e 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareConfigurationOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareConfigurationOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDancerOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDancerOuterClass.java
index b99046cb9..b99046cb9 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDancerOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDancerOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDancerTypeOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDancerTypeOuterClass.java
index ea91e4b2f..ea91e4b2f 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDancerTypeOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDancerTypeOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDispenserOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDispenserOuterClass.java
index 3af00225f..3af00225f 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDispenserOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDispenserOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDispenserTypeOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDispenserTypeOuterClass.java
index 793445eb9..793445eb9 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDispenserTypeOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareDispenserTypeOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareMotorOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareMotorOuterClass.java
index 114e66428..114e66428 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareMotorOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareMotorOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareMotorTypeOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareMotorTypeOuterClass.java
index 3f7c551ac..3f7c551ac 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareMotorTypeOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareMotorTypeOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwarePidControlOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwarePidControlOuterClass.java
index d77097322..d77097322 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwarePidControlOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwarePidControlOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwarePidControlTypeOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwarePidControlTypeOuterClass.java
index aff79b997..aff79b997 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwarePidControlTypeOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwarePidControlTypeOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareWinderOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareWinderOuterClass.java
index 9cb93238b..9cb93238b 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareWinderOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareWinderOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareWinderTypeOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareWinderTypeOuterClass.java
index 09f3fad91..09f3fad91 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareWinderTypeOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/HardwareWinderTypeOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/UploadHardwareConfigurationRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/UploadHardwareConfigurationRequestOuterClass.java
index bbf0b1a76..bbf0b1a76 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/UploadHardwareConfigurationRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/UploadHardwareConfigurationRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/UploadHardwareConfigurationResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/UploadHardwareConfigurationResponseOuterClass.java
index a12274260..a12274260 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/UploadHardwareConfigurationResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/hardware/UploadHardwareConfigurationResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/DirectSynchronizationRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/DirectSynchronizationRequestOuterClass.java
index b2d324b39..b2d324b39 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/DirectSynchronizationRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/DirectSynchronizationRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/DirectSynchronizationResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/DirectSynchronizationResponseOuterClass.java
index e1187ec4b..e1187ec4b 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/DirectSynchronizationResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/DirectSynchronizationResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/ExternalBridgeUdpDiscoveryPacketOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/ExternalBridgeUdpDiscoveryPacketOuterClass.java
index 5b83561c0..5b83561c0 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/ExternalBridgeUdpDiscoveryPacketOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/ExternalBridgeUdpDiscoveryPacketOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/ExternalClientLoginRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/ExternalClientLoginRequestOuterClass.java
index 4709d4992..4709d4992 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/ExternalClientLoginRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/ExternalClientLoginRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/ExternalClientLoginResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/ExternalClientLoginResponseOuterClass.java
index 57600bbc2..57600bbc2 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/ExternalClientLoginResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/ExternalClientLoginResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/OverrideDataBaseRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/OverrideDataBaseRequestOuterClass.java
index b02fae384..b02fae384 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/OverrideDataBaseRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/OverrideDataBaseRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/OverrideDataBaseResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/OverrideDataBaseResponseOuterClass.java
index 562f4259c..562f4259c 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/OverrideDataBaseResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/integration/OverrideDataBaseResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/AbortJobRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/AbortJobRequestOuterClass.java
index 9fe3f94c0..9fe3f94c0 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/AbortJobRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/AbortJobRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/AbortJobResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/AbortJobResponseOuterClass.java
index 1bcdc8b22..1bcdc8b22 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/AbortJobResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/AbortJobResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/DispenserLiquidTypeOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/DispenserLiquidTypeOuterClass.java
index dd8eb8900..dd8eb8900 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/DispenserLiquidTypeOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/DispenserLiquidTypeOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/DispenserStepDivisionOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/DispenserStepDivisionOuterClass.java
index 583cbebe7..583cbebe7 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/DispenserStepDivisionOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/DispenserStepDivisionOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobBrushStopOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobBrushStopOuterClass.java
index bf6c514ce..bf6c514ce 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobBrushStopOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobBrushStopOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobDispenserOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobDispenserOuterClass.java
index e92b626ad..e92b626ad 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobDispenserOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobDispenserOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobRequestOuterClass.java
index 23c5b0202..23c5b0202 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobResponseOuterClass.java
index 6ae7812a7..6ae7812a7 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobSegmentOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobSegmentOuterClass.java
index e2989752a..e2989752a 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobSegmentOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobSegmentOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobSpoolOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobSpoolOuterClass.java
index 59b88e4f1..59b88e4f1 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobSpoolOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobSpoolOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobSpoolTypeOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobSpoolTypeOuterClass.java
index adef669eb..adef669eb 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobSpoolTypeOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobSpoolTypeOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobStatusOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobStatusOuterClass.java
index 0440be357..0440be357 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobStatusOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobStatusOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobTicketOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobTicketOuterClass.java
index acd753ea0..acd753ea0 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobTicketOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobTicketOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobWindingMethodOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobWindingMethodOuterClass.java
index e81f5df48..e81f5df48 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobWindingMethodOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/JobWindingMethodOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/ProcessParametersOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/ProcessParametersOuterClass.java
index 0a8f03ca5..0a8f03ca5 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/ProcessParametersOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/ProcessParametersOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/UploadProcessParametersRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/UploadProcessParametersRequestOuterClass.java
index 9813ff270..9813ff270 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/UploadProcessParametersRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/UploadProcessParametersRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/UploadProcessParametersResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/UploadProcessParametersResponseOuterClass.java
index 5649b21c7..5649b21c7 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/UploadProcessParametersResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/printing/UploadProcessParametersResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/CalculateRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/CalculateRequestOuterClass.java
index 09180939e..09180939e 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/CalculateRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/CalculateRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/CalculateResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/CalculateResponseOuterClass.java
index b20ba95cd..b20ba95cd 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/CalculateResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/CalculateResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/ProgressRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/ProgressRequestOuterClass.java
index 3cfd9dcfe..3cfd9dcfe 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/ProgressRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/ProgressRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/ProgressResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/ProgressResponseOuterClass.java
index 1a14dd2a5..1a14dd2a5 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/ProgressResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/ProgressResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeReadRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeReadRequestOuterClass.java
index baed0890f..baed0890f 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeReadRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeReadRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeReadResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeReadResponseOuterClass.java
index 1d4437bf2..1d4437bf2 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeReadResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeReadResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeWriteRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeWriteRequestOuterClass.java
index d379d450b..d379d450b 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeWriteRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeWriteRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeWriteResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeWriteResponseOuterClass.java
index abcdd9ed2..abcdd9ed2 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeWriteResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeWriteResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubDispenserRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubDispenserRequestOuterClass.java
index b110673b5..b110673b5 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubDispenserRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubDispenserRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubDispenserResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubDispenserResponseOuterClass.java
index 2d31705c8..2d31705c8 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubDispenserResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubDispenserResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashReadRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashReadRequestOuterClass.java
index edc3d6737..edc3d6737 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashReadRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashReadRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashReadResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashReadResponseOuterClass.java
index 8db28fed5..8db28fed5 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashReadResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashReadResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashWriteRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashWriteRequestOuterClass.java
index 9f706c4bb..9f706c4bb 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashWriteRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashWriteRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashWriteResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashWriteResponseOuterClass.java
index a2cf9fbd0..a2cf9fbd0 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashWriteResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashWriteResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubF3Gpo01WriteRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubF3Gpo01WriteRequestOuterClass.java
index 5f6638941..5f6638941 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubF3Gpo01WriteRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubF3Gpo01WriteRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubF3Gpo01WriteResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubF3Gpo01WriteResponseOuterClass.java
index 489323378..489323378 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubF3Gpo01WriteResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubF3Gpo01WriteResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadBackRegRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadBackRegRequestOuterClass.java
index fec11c3fc..fec11c3fc 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadBackRegRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadBackRegRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadBackRegResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadBackRegResponseOuterClass.java
index 44a9f3cb8..44a9f3cb8 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadBackRegResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadBackRegResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadVersionRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadVersionRequestOuterClass.java
index a269461d1..a269461d1 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadVersionRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadVersionRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadVersionResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadVersionResponseOuterClass.java
index 2ac79179f..2ac79179f 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadVersionResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubFPGAReadVersionResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOInputSetupRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOInputSetupRequestOuterClass.java
index 98af7034c..98af7034c 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOInputSetupRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOInputSetupRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOInputSetupResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOInputSetupResponseOuterClass.java
index 9a697772e..9a697772e 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOInputSetupResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOInputSetupResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadBitRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadBitRequestOuterClass.java
index 8d683244b..8d683244b 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadBitRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadBitRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadBitResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadBitResponseOuterClass.java
index 4d1a944dc..4d1a944dc 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadBitResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadBitResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadByteRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadByteRequestOuterClass.java
index c928a15a8..c928a15a8 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadByteRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadByteRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadByteResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadByteResponseOuterClass.java
index abddb9fc5..abddb9fc5 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadByteResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadByteResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteBitRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteBitRequestOuterClass.java
index 9271b1e44..9271b1e44 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteBitRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteBitRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteBitResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteBitResponseOuterClass.java
index 3dc0346be..3dc0346be 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteBitResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteBitResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteByteRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteByteRequestOuterClass.java
index b35dab59b..b35dab59b 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteByteRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteByteRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteByteResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteByteResponseOuterClass.java
index ff5118301..ff5118301 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteByteResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteByteResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHWVersionRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHWVersionRequestOuterClass.java
index e6052c209..e6052c209 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHWVersionRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHWVersionRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHWVersionResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHWVersionResponseOuterClass.java
index 1b50b8345..1b50b8345 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHWVersionResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHWVersionResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHeaterRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHeaterRequestOuterClass.java
index a443addbb..a443addbb 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHeaterRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHeaterRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHeaterResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHeaterResponseOuterClass.java
index 055eed4d3..055eed4d3 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHeaterResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHeaterResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubL6470DriverRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubL6470DriverRequestOuterClass.java
index b4d9f41dc..b4d9f41dc 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubL6470DriverRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubL6470DriverRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubL6470DriverResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubL6470DriverResponseOuterClass.java
index 7c938c1fb..7c938c1fb 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubL6470DriverResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubL6470DriverResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorEncoderRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorEncoderRequestOuterClass.java
index f55007864..f55007864 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorEncoderRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorEncoderRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorEncoderResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorEncoderResponseOuterClass.java
index 53af5a43d..53af5a43d 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorEncoderResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorEncoderResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorInitRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorInitRequestOuterClass.java
index dc8299a4d..dc8299a4d 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorInitRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorInitRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorInitResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorInitResponseOuterClass.java
index 634c100b9..634c100b9 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorInitResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorInitResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorMovRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorMovRequestOuterClass.java
index 9c7b6597a..9c7b6597a 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorMovRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorMovRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorMovResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorMovResponseOuterClass.java
index 05df4bc94..05df4bc94 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorMovResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorMovResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorPositionRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorPositionRequestOuterClass.java
index 3e6f83665..3e6f83665 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorPositionRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorPositionRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorPositionResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorPositionResponseOuterClass.java
index 95ab7a2cf..95ab7a2cf 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorPositionResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorPositionResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorRunRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorRunRequestOuterClass.java
index e061e11e8..e061e11e8 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorRunRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorRunRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorRunResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorRunResponseOuterClass.java
index 2323663a7..2323663a7 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorRunResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorRunResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorSpeedRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorSpeedRequestOuterClass.java
index f14c83182..f14c83182 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorSpeedRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorSpeedRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorSpeedResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorSpeedResponseOuterClass.java
index 837ea469c..837ea469c 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorSpeedResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorSpeedResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStatusRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStatusRequestOuterClass.java
index 897801900..897801900 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStatusRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStatusRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStatusResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStatusResponseOuterClass.java
index 100f30f2e..100f30f2e 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStatusResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStatusResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStopRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStopRequestOuterClass.java
index 910fa92c8..910fa92c8 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStopRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStopRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStopResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStopResponseOuterClass.java
index 73b71d8e2..73b71d8e2 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStopResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorStopResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubOptLimitSwitchRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubOptLimitSwitchRequestOuterClass.java
index 8331c4cc6..8331c4cc6 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubOptLimitSwitchRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubOptLimitSwitchRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubOptLimitSwitchResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubOptLimitSwitchResponseOuterClass.java
index 147a317c5..147a317c5 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubOptLimitSwitchResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubOptLimitSwitchResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubSteperMotorRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubSteperMotorRequestOuterClass.java
index 1dcfa1412..1dcfa1412 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubSteperMotorRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubSteperMotorRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubSteperMotorResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubSteperMotorResponseOuterClass.java
index 8852fdb4f..8852fdb4f 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubSteperMotorResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubSteperMotorResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubValveRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubValveRequestOuterClass.java
index 4d1c6a179..4d1c6a179 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubValveRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubValveRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubValveResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubValveResponseOuterClass.java
index f33980d06..f33980d06 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubValveResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubValveResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/synchronization/SynchronizeDBRequestOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/synchronization/SynchronizeDBRequestOuterClass.java
index d9dfa19e4..d9dfa19e4 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/synchronization/SynchronizeDBRequestOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/synchronization/SynchronizeDBRequestOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/synchronization/SynchronizeDBResponseOuterClass.java b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/synchronization/SynchronizeDBResponseOuterClass.java
index 653befd01..653befd01 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/synchronization/SynchronizeDBResponseOuterClass.java
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/java/com/twine/tango/pmr/synchronization/SynchronizeDBResponseOuterClass.java
diff --git a/Software/Android_Studio/Tango.PMR/src/main/res/raw/packages.txt b/Software/Android_Studio/Tango/Tango.PMR/src/main/res/raw/packages.txt
index f571399a1..f571399a1 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/res/raw/packages.txt
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/res/raw/packages.txt
diff --git a/Software/Android_Studio/Tango.PMR/src/main/res/values/strings.xml b/Software/Android_Studio/Tango/Tango.PMR/src/main/res/values/strings.xml
index 13796832c..13796832c 100644
--- a/Software/Android_Studio/Tango.PMR/src/main/res/values/strings.xml
+++ b/Software/Android_Studio/Tango/Tango.PMR/src/main/res/values/strings.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/.gitignore b/Software/Android_Studio/Tango/Tango.SharedUI/.gitignore
index 796b96d1c..796b96d1c 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/.gitignore
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/.gitignore
diff --git a/Software/Android_Studio/Tango.SharedUI/build.gradle b/Software/Android_Studio/Tango/Tango.SharedUI/build.gradle
index 0696c1e2e..0696c1e2e 100644
--- a/Software/Android_Studio/Tango.SharedUI/build.gradle
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/build.gradle
diff --git a/Software/Android_Studio/Tango.SharedUI/proguard-rules.pro b/Software/Android_Studio/Tango/Tango.SharedUI/proguard-rules.pro
index a0eef131a..a0eef131a 100644
--- a/Software/Android_Studio/Tango.SharedUI/proguard-rules.pro
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/proguard-rules.pro
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/AndroidManifest.xml b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/AndroidManifest.xml
index 36d543b36..36d543b36 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/AndroidManifest.xml
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/AndroidManifest.xml
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/TangoApplication.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/TangoApplication.java
index aacb35350..aacb35350 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/TangoApplication.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/TangoApplication.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/binding_adapters/BindingAdapters.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/binding_adapters/BindingAdapters.java
index 6b6d4b6e9..6b6d4b6e9 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/binding_adapters/BindingAdapters.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/binding_adapters/BindingAdapters.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/binding_converters/ObjectToIntConverter.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/binding_converters/ObjectToIntConverter.java
index ee6de2b66..ee6de2b66 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/binding_converters/ObjectToIntConverter.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/binding_converters/ObjectToIntConverter.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/ActivityBase.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/ActivityBase.java
index 4526a4f09..4526a4f09 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/ActivityBase.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/ActivityBase.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/ActivityCallbackService.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/ActivityCallbackService.java
index 842d49561..842d49561 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/ActivityCallbackService.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/ActivityCallbackService.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/FragmentBase.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/FragmentBase.java
index 61ed42764..61ed42764 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/FragmentBase.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/FragmentBase.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/FragmentBaseV4.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/FragmentBaseV4.java
index 5050a64fc..5050a64fc 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/FragmentBaseV4.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/containers/FragmentBaseV4.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/IParameterized.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/IParameterized.java
index 95b352987..95b352987 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/IParameterized.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/IParameterized.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/ParameterAnnotation.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/ParameterAnnotation.java
index 102bb0b4f..102bb0b4f 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/ParameterAnnotation.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/ParameterAnnotation.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/ParameterItem.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/ParameterItem.java
index a89b1c671..a89b1c671 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/ParameterItem.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/ParameterItem.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/ParameterizedEditor.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/ParameterizedEditor.java
index 64ab322b9..64ab322b9 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/ParameterizedEditor.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/editors/ParameterizedEditor.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/DependencyProperty.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/DependencyProperty.java
index 95b42f357..95b42f357 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/DependencyProperty.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/DependencyProperty.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/FieldUtils.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/FieldUtils.java
index 8ec2fe33b..8ec2fe33b 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/FieldUtils.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/FieldUtils.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/IView.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/IView.java
index 9f0ef2b9f..9f0ef2b9f 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/IView.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/IView.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/ReadOnlyField.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/ReadOnlyField.java
index 067dd953b..067dd953b 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/ReadOnlyField.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/ReadOnlyField.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/RelayCommand.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/RelayCommand.java
index e6d638678..e6d638678 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/RelayCommand.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/RelayCommand.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/ViewModelBase.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/ViewModelBase.java
index 1d2e5ad86..1d2e5ad86 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/ViewModelBase.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/mvvm/ViewModelBase.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/navigation/AndroidNavigationProvider.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/navigation/AndroidNavigationProvider.java
index 545793a5d..545793a5d 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/navigation/AndroidNavigationProvider.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/navigation/AndroidNavigationProvider.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/navigation/INavigationProvider.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/navigation/INavigationProvider.java
index cc333cfd8..cc333cfd8 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/navigation/INavigationProvider.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/navigation/INavigationProvider.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/notifications/AndroidNotificationProvider.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/notifications/AndroidNotificationProvider.java
index e1a099093..e1a099093 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/notifications/AndroidNotificationProvider.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/notifications/AndroidNotificationProvider.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/notifications/INotificationProvider.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/notifications/INotificationProvider.java
index 241c8a49c..241c8a49c 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/notifications/INotificationProvider.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/notifications/INotificationProvider.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/paging/PagerAdapter.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/paging/PagerAdapter.java
index a74848816..a74848816 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/paging/PagerAdapter.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/paging/PagerAdapter.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/paging/PagerZoomTransform.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/paging/PagerZoomTransform.java
index 4fefcff13..4fefcff13 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/paging/PagerZoomTransform.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/paging/PagerZoomTransform.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/validation/IViewValidator.java b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/validation/IViewValidator.java
index 710d57e49..710d57e49 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/validation/IViewValidator.java
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/java/com/twine/tango/sharedui/validation/IViewValidator.java
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/res/animator/slide_in_left.xml b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/animator/slide_in_left.xml
index 4477230df..4477230df 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/res/animator/slide_in_left.xml
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/animator/slide_in_left.xml
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/res/animator/slide_in_right.xml b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/animator/slide_in_right.xml
index 8869d9968..8869d9968 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/res/animator/slide_in_right.xml
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/animator/slide_in_right.xml
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/res/animator/slide_out_left.xml b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/animator/slide_out_left.xml
index ba68a3065..ba68a3065 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/res/animator/slide_out_left.xml
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/animator/slide_out_left.xml
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/res/animator/slide_out_right.xml b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/animator/slide_out_right.xml
index 9abbbb625..9abbbb625 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/res/animator/slide_out_right.xml
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/animator/slide_out_right.xml
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/res/drawable/rounded_rectangle.xml b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/drawable/rounded_rectangle.xml
index ed4e6abde..ed4e6abde 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/res/drawable/rounded_rectangle.xml
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/drawable/rounded_rectangle.xml
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/res/layout/editor_range.xml b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/layout/editor_range.xml
index 41683ddb7..41683ddb7 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/res/layout/editor_range.xml
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/layout/editor_range.xml
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/res/layout/editor_title.xml b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/layout/editor_title.xml
index cc4a3a901..cc4a3a901 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/res/layout/editor_title.xml
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/layout/editor_title.xml
diff --git a/Software/Android_Studio/Tango.SharedUI/src/main/res/values/strings.xml b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/values/strings.xml
index 824fc72c7..824fc72c7 100644
--- a/Software/Android_Studio/Tango.SharedUI/src/main/res/values/strings.xml
+++ b/Software/Android_Studio/Tango/Tango.SharedUI/src/main/res/values/strings.xml
diff --git a/Software/Android_Studio/Tango.Stubs/.gitignore b/Software/Android_Studio/Tango/Tango.Stubs.UI/.gitignore
index 796b96d1c..796b96d1c 100644
--- a/Software/Android_Studio/Tango.Stubs/.gitignore
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/.gitignore
diff --git a/Software/Android_Studio/Tango.Stubs.UI/build.gradle b/Software/Android_Studio/Tango/Tango.Stubs.UI/build.gradle
index 6214adf2c..6214adf2c 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/build.gradle
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/build.gradle
diff --git a/Software/Android_Studio/Tango.Stubs.UI/proguard-rules.pro b/Software/Android_Studio/Tango/Tango.Stubs.UI/proguard-rules.pro
index a0eef131a..a0eef131a 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/proguard-rules.pro
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/proguard-rules.pro
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/AndroidManifest.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/AndroidManifest.xml
index ad99a3b57..ad99a3b57 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/AndroidManifest.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/AndroidManifest.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/App.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/App.java
index 96b5b490d..96b5b490d 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/App.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/App.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/Events/LoginEvent.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/Events/LoginEvent.java
index da5f62124..da5f62124 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/Events/LoginEvent.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/Events/LoginEvent.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/Events/StubSelectedEvent.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/Events/StubSelectedEvent.java
index 1c2826c25..1c2826c25 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/Events/StubSelectedEvent.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/Events/StubSelectedEvent.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/ApplicationComponent.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/ApplicationComponent.java
index cbd61f9ee..cbd61f9ee 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/ApplicationComponent.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/ApplicationComponent.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/ApplicationModule.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/ApplicationModule.java
index ce664f835..ce664f835 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/ApplicationModule.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/ApplicationModule.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/EventBusModule.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/EventBusModule.java
index 3aeb461f7..3aeb461f7 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/EventBusModule.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/EventBusModule.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/IntegrationModule.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/IntegrationModule.java
index 7fd86f537..7fd86f537 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/IntegrationModule.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/IntegrationModule.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/NavigationModule.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/NavigationModule.java
index 674157858..674157858 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/NavigationModule.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/NavigationModule.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/NotificationModule.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/NotificationModule.java
index 69d6d8f62..69d6d8f62 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/NotificationModule.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/NotificationModule.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/ViewModelsModule.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/ViewModelsModule.java
index b7e494ecf..b7e494ecf 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/ViewModelsModule.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/dagger/ViewModelsModule.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/login/ILoginFragment.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/login/ILoginFragment.java
index f5ab3ec4b..f5ab3ec4b 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/login/ILoginFragment.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/login/ILoginFragment.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/login/LoginFragment.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/login/LoginFragment.java
index 267977ede..267977ede 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/login/LoginFragment.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/login/LoginFragment.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/login/LoginFragmentVM.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/login/LoginFragmentVM.java
index 2701aa63d..2701aa63d 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/login/LoginFragmentVM.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/login/LoginFragmentVM.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/IMainActivity.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/IMainActivity.java
index 57d550763..57d550763 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/IMainActivity.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/IMainActivity.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/MainActivity.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/MainActivity.java
index c1f85b971..c1f85b971 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/MainActivity.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/MainActivity.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/MainActivityVM.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/MainActivityVM.java
index 0357fee18..0357fee18 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/MainActivityVM.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/main/MainActivityVM.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/selection/ISelectionFragment.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/selection/ISelectionFragment.java
index bab0f1782..bab0f1782 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/selection/ISelectionFragment.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/selection/ISelectionFragment.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/selection/SelectionFragment.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/selection/SelectionFragment.java
index ed1f85f55..ed1f85f55 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/selection/SelectionFragment.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/selection/SelectionFragment.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/selection/SelectionFragmentVM.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/selection/SelectionFragmentVM.java
index 6eeac9a86..6eeac9a86 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/selection/SelectionFragmentVM.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/selection/SelectionFragmentVM.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stub/IStubFragment.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stub/IStubFragment.java
index bf63e15c8..bf63e15c8 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stub/IStubFragment.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stub/IStubFragment.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stub/StubFragment.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stub/StubFragment.java
index 48f9a1ccd..48f9a1ccd 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stub/StubFragment.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stub/StubFragment.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stub/StubFragmentVM.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stub/StubFragmentVM.java
index f490ccee6..f490ccee6 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stub/StubFragmentVM.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stub/StubFragmentVM.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stubs/IStubsFragment.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stubs/IStubsFragment.java
index 5d6f6a296..5d6f6a296 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stubs/IStubsFragment.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stubs/IStubsFragment.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stubs/StubsFragment.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stubs/StubsFragment.java
index b48962a76..b48962a76 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stubs/StubsFragment.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stubs/StubsFragment.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stubs/StubsFragmentVM.java b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stubs/StubsFragmentVM.java
index ceacf4e00..ceacf4e00 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stubs/StubsFragmentVM.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/views/stubs/StubsFragmentVM.java
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/database.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/database.png
index 4263288e8..4263288e8 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/database.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/database.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/ic_database.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/ic_database.xml
index 010978dae..010978dae 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/ic_database.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/ic_database.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/ic_launcher_background.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/ic_launcher_background.xml
index 1cd2a3665..1cd2a3665 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/ic_launcher_background.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/ic_launcher_background.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/ic_play.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/ic_play.xml
index 63c765d2b..63c765d2b 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/ic_play.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/ic_play.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/ic_stop.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/ic_stop.xml
index bd94ea32f..bd94ea32f 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/ic_stop.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/ic_stop.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/ic_stubs.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/ic_stubs.xml
index 8eea0f836..8eea0f836 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/ic_stubs.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/ic_stubs.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/list_view_selectable.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/list_view_selectable.xml
index 8895ad0ae..8895ad0ae 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/list_view_selectable.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/list_view_selectable.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/stubs.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/stubs.png
index 5d6249d61..5d6249d61 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/stubs.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/stubs.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/user.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/user.png
index 8d700439a..8d700439a 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/drawable/user.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/drawable/user.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/layout/activity_main.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/layout/activity_main.xml
index 856d3f154..856d3f154 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/layout/activity_main.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/layout/activity_main.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/layout/activity_stub.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/layout/activity_stub.xml
index 13919b5cb..13919b5cb 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/layout/activity_stub.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/layout/activity_stub.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/layout/activity_stubs.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/layout/activity_stubs.xml
index 57bf93db4..57bf93db4 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/layout/activity_stubs.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/layout/activity_stubs.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/layout/fragment_login.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/layout/fragment_login.xml
index db174541a..db174541a 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/layout/fragment_login.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/layout/fragment_login.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/layout/fragment_selection.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/layout/fragment_selection.xml
index 938f06e32..938f06e32 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/layout/fragment_selection.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/layout/fragment_selection.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/layout/side_menu.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/layout/side_menu.xml
index 0e2cfe65b..0e2cfe65b 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/layout/side_menu.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/layout/side_menu.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/layout/stubs_listview_item.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/layout/stubs_listview_item.xml
index 0300fc558..0300fc558 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/layout/stubs_listview_item.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/layout/stubs_listview_item.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 00f9eaaf3..00f9eaaf3 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 00f9eaaf3..00f9eaaf3 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-hdpi/ic_launcher.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-hdpi/ic_launcher.png
index 550730310..550730310 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index 4e526c95b..4e526c95b 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-hdpi/ic_launcher_round.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-hdpi/ic_launcher_round.png
index 8fab6a3a5..8fab6a3a5 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-mdpi/ic_launcher.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-mdpi/ic_launcher.png
index 6bc7fcd6f..6bc7fcd6f 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
index 2c38c7190..2c38c7190 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-mdpi/ic_launcher_round.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-mdpi/ic_launcher_round.png
index 1eecc0e7d..1eecc0e7d 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xhdpi/ic_launcher.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xhdpi/ic_launcher.png
index ec87dcebe..ec87dcebe 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
index 072467eaa..072467eaa 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index 05ca079ca..05ca079ca 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 6f67f21ba..6f67f21ba 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
index 78a6b7a34..78a6b7a34 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index 8bac0f274..8bac0f274 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 0327e13fa..0327e13fa 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 68ebe33fe..68ebe33fe 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index bacd3e758..bacd3e758 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/values/colors.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/values/colors.xml
index d446dbf48..d446dbf48 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/values/colors.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/values/colors.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/values/strings.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/values/strings.xml
index 7160cf9f5..7160cf9f5 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/values/strings.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/values/strings.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/values/styles.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/values/styles.xml
index 19e556ba1..19e556ba1 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/values/styles.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/values/styles.xml
diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/xml/device_filter.xml b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/xml/device_filter.xml
index 888cfe3bf..888cfe3bf 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/res/xml/device_filter.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs.UI/src/main/res/xml/device_filter.xml
diff --git a/Software/Android_Studio/Tango.Transport/.gitignore b/Software/Android_Studio/Tango/Tango.Stubs/.gitignore
index 796b96d1c..796b96d1c 100644
--- a/Software/Android_Studio/Tango.Transport/.gitignore
+++ b/Software/Android_Studio/Tango/Tango.Stubs/.gitignore
diff --git a/Software/Android_Studio/Tango.Stubs/build.gradle b/Software/Android_Studio/Tango/Tango.Stubs/build.gradle
index a6815ffe3..a6815ffe3 100644
--- a/Software/Android_Studio/Tango.Stubs/build.gradle
+++ b/Software/Android_Studio/Tango/Tango.Stubs/build.gradle
diff --git a/Software/Android_Studio/Tango.Stubs/proguard-rules.pro b/Software/Android_Studio/Tango/Tango.Stubs/proguard-rules.pro
index a0eef131a..a0eef131a 100644
--- a/Software/Android_Studio/Tango.Stubs/proguard-rules.pro
+++ b/Software/Android_Studio/Tango/Tango.Stubs/proguard-rules.pro
diff --git a/Software/Android_Studio/Tango.Stubs/src/main/AndroidManifest.xml b/Software/Android_Studio/Tango/Tango.Stubs/src/main/AndroidManifest.xml
index 9e51ae77e..9e51ae77e 100644
--- a/Software/Android_Studio/Tango.Stubs/src/main/AndroidManifest.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs/src/main/AndroidManifest.xml
diff --git a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/AvailableStub.java b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/AvailableStub.java
index f6b4fe7cd..f6b4fe7cd 100644
--- a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/AvailableStub.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/AvailableStub.java
diff --git a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/IStub.java b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/IStub.java
index 5bacc06ad..5bacc06ad 100644
--- a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/IStub.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/IStub.java
diff --git a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubAnnotation.java b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubAnnotation.java
index 68c19066a..68c19066a 100644
--- a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubAnnotation.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubAnnotation.java
diff --git a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubBase.java b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubBase.java
index f79a12b8f..f79a12b8f 100644
--- a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubBase.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubBase.java
diff --git a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubDirection.java b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubDirection.java
index b9b3483ec..b9b3483ec 100644
--- a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubDirection.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubDirection.java
diff --git a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubState.java b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubState.java
index 1b492b45f..1b492b45f 100644
--- a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubState.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/StubState.java
diff --git a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/stubs/Calculate.java b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/stubs/Calculate.java
index 1e0d6f199..1e0d6f199 100644
--- a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/stubs/Calculate.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/stubs/Calculate.java
diff --git a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/stubs/Progress.java b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/stubs/Progress.java
index e1838a34f..e1838a34f 100644
--- a/Software/Android_Studio/Tango.Stubs/src/main/java/com/twine/tango/stubs/stubs/Progress.java
+++ b/Software/Android_Studio/Tango/Tango.Stubs/src/main/java/com/twine/tango/stubs/stubs/Progress.java
diff --git a/Software/Android_Studio/Tango.Stubs/src/main/res/raw/stubs.txt b/Software/Android_Studio/Tango/Tango.Stubs/src/main/res/raw/stubs.txt
index 62376dd96..62376dd96 100644
--- a/Software/Android_Studio/Tango.Stubs/src/main/res/raw/stubs.txt
+++ b/Software/Android_Studio/Tango/Tango.Stubs/src/main/res/raw/stubs.txt
diff --git a/Software/Android_Studio/Tango.Stubs/src/main/res/values/strings.xml b/Software/Android_Studio/Tango/Tango.Stubs/src/main/res/values/strings.xml
index 62b1a5fd0..62b1a5fd0 100644
--- a/Software/Android_Studio/Tango.Stubs/src/main/res/values/strings.xml
+++ b/Software/Android_Studio/Tango/Tango.Stubs/src/main/res/values/strings.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/attr/R.txt b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/attr/R.txt
index a8028d5c7..a8028d5c7 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/attr/R.txt
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/attr/R.txt
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/compileDebugAidl/dependency.store b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/compileDebugAidl/dependency.store
index 8b8400dcf..8b8400dcf 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/compileDebugAidl/dependency.store
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/compileDebugAidl/dependency.store
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/compileDebugAndroidTestAidl/dependency.store b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/compileDebugAndroidTestAidl/dependency.store
index 8b8400dcf..8b8400dcf 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/compileDebugAndroidTestAidl/dependency.store
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/compileDebugAndroidTestAidl/dependency.store
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/debug-mergeJniLibs/merge-state b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/debug-mergeJniLibs/merge-state
index db23c9f2a..db23c9f2a 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/debug-mergeJniLibs/merge-state
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/debug-mergeJniLibs/merge-state
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index 0e0b4eece..0e0b4eece 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-af/values-af.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-af/values-af.xml
index 4a32ca93f..4a32ca93f 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-af/values-af.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-af/values-af.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-am/values-am.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-am/values-am.xml
index 56f0715d1..56f0715d1 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-am/values-am.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-am/values-am.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ar-rEG/values-ar-rEG.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ar-rEG/values-ar-rEG.xml
index 16b18ff6d..16b18ff6d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ar-rEG/values-ar-rEG.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ar-rEG/values-ar-rEG.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ar/values-ar.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ar/values-ar.xml
index 8a9d6a1c6..8a9d6a1c6 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ar/values-ar.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ar/values-ar.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-az-rAZ/values-az-rAZ.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-az-rAZ/values-az-rAZ.xml
index c933b1f7f..c933b1f7f 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-az-rAZ/values-az-rAZ.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-az-rAZ/values-az-rAZ.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-az/values-az.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-az/values-az.xml
index 1284e554d..1284e554d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-az/values-az.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-az/values-az.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml
index 05e53a7c4..05e53a7c4 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-be/values-be.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-be/values-be.xml
index a5600ce82..a5600ce82 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-be/values-be.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-be/values-be.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bg/values-bg.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bg/values-bg.xml
index 4cfe4f0f0..4cfe4f0f0 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bg/values-bg.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bg/values-bg.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bn/values-bn.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bn/values-bn.xml
index 89f21d1a3..89f21d1a3 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bn/values-bn.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bn/values-bn.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bs/values-bs.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bs/values-bs.xml
index 1c7eff089..1c7eff089 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bs/values-bs.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-bs/values-bs.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ca/values-ca.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ca/values-ca.xml
index 39fcd4a5f..39fcd4a5f 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ca/values-ca.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ca/values-ca.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-cs/values-cs.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-cs/values-cs.xml
index d8391cd20..d8391cd20 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-cs/values-cs.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-cs/values-cs.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-da/values-da.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-da/values-da.xml
index e7a82c53c..e7a82c53c 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-da/values-da.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-da/values-da.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-de/values-de.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-de/values-de.xml
index 0a90981e0..0a90981e0 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-de/values-de.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-de/values-de.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-el/values-el.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-el/values-el.xml
index cd948bb9a..cd948bb9a 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-el/values-el.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-el/values-el.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rAU/values-en-rAU.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rAU/values-en-rAU.xml
index cb3a93f4b..cb3a93f4b 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rAU/values-en-rAU.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rAU/values-en-rAU.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rCA/values-en-rCA.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rCA/values-en-rCA.xml
index 53b31839d..53b31839d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rCA/values-en-rCA.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rCA/values-en-rCA.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rGB/values-en-rGB.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rGB/values-en-rGB.xml
index 2ab8eb15e..2ab8eb15e 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rGB/values-en-rGB.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rGB/values-en-rGB.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rIE/values-en-rIE.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rIE/values-en-rIE.xml
index 53b31839d..53b31839d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rIE/values-en-rIE.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rIE/values-en-rIE.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rIN/values-en-rIN.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rIN/values-en-rIN.xml
index 2ab8eb15e..2ab8eb15e 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rIN/values-en-rIN.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rIN/values-en-rIN.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rNZ/values-en-rNZ.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rNZ/values-en-rNZ.xml
index 53b31839d..53b31839d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rNZ/values-en-rNZ.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rNZ/values-en-rNZ.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rUS/values-en-rUS.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rUS/values-en-rUS.xml
index 53b31839d..53b31839d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rUS/values-en-rUS.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rUS/values-en-rUS.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rZA/values-en-rZA.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rZA/values-en-rZA.xml
index 53b31839d..53b31839d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rZA/values-en-rZA.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-en-rZA/values-en-rZA.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es-rUS/values-es-rUS.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es-rUS/values-es-rUS.xml
index 695e69250..695e69250 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es-rUS/values-es-rUS.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es-rUS/values-es-rUS.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es/values-es.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es/values-es.xml
index 2e52ec379..2e52ec379 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es/values-es.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-es/values-es.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-et-rEE/values-et-rEE.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-et-rEE/values-et-rEE.xml
index 2d13da4c4..2d13da4c4 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-et-rEE/values-et-rEE.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-et-rEE/values-et-rEE.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-et/values-et.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-et/values-et.xml
index 2be4fca3f..2be4fca3f 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-et/values-et.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-et/values-et.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-eu/values-eu.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-eu/values-eu.xml
index 74fc58b7e..74fc58b7e 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-eu/values-eu.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-eu/values-eu.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fa/values-fa.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fa/values-fa.xml
index 8b49b4b52..8b49b4b52 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fa/values-fa.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fa/values-fa.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fi-rFI/values-fi-rFI.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fi-rFI/values-fi-rFI.xml
index 16b18ff6d..16b18ff6d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fi-rFI/values-fi-rFI.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fi-rFI/values-fi-rFI.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fi/values-fi.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fi/values-fi.xml
index 527729057..527729057 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fi/values-fi.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fi/values-fi.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr-rCA/values-fr-rCA.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr-rCA/values-fr-rCA.xml
index 2c061c3d4..2c061c3d4 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr-rCA/values-fr-rCA.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr-rCA/values-fr-rCA.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr/values-fr.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr/values-fr.xml
index 083cef7dd..083cef7dd 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr/values-fr.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-fr/values-fr.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gl/values-gl.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gl/values-gl.xml
index e64cee80f..e64cee80f 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gl/values-gl.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gl/values-gl.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gu/values-gu.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gu/values-gu.xml
index 00e9de34e..00e9de34e 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gu/values-gu.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-gu/values-gu.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml
index e38bb90b3..e38bb90b3 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml
index d5a138ef9..d5a138ef9 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hi-rIN/values-hi-rIN.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hi-rIN/values-hi-rIN.xml
index 16b18ff6d..16b18ff6d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hi-rIN/values-hi-rIN.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hi-rIN/values-hi-rIN.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hi/values-hi.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hi/values-hi.xml
index b0b83c14a..b0b83c14a 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hi/values-hi.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hi/values-hi.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hr-rHR/values-hr-rHR.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hr-rHR/values-hr-rHR.xml
index 16b18ff6d..16b18ff6d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hr-rHR/values-hr-rHR.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hr-rHR/values-hr-rHR.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hr/values-hr.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hr/values-hr.xml
index c5c9c10fe..c5c9c10fe 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hr/values-hr.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hr/values-hr.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hu-rHU/values-hu-rHU.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hu-rHU/values-hu-rHU.xml
index 53b31839d..53b31839d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hu-rHU/values-hu-rHU.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hu-rHU/values-hu-rHU.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hu/values-hu.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hu/values-hu.xml
index 2b1d235d5..2b1d235d5 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hu/values-hu.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hu/values-hu.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hy-rAM/values-hy-rAM.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hy-rAM/values-hy-rAM.xml
index 5a73fb4a9..5a73fb4a9 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hy-rAM/values-hy-rAM.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hy-rAM/values-hy-rAM.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hy/values-hy.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hy/values-hy.xml
index d6b87b030..d6b87b030 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hy/values-hy.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-hy/values-hy.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-in-rID/values-in-rID.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-in-rID/values-in-rID.xml
index 16b18ff6d..16b18ff6d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-in-rID/values-in-rID.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-in-rID/values-in-rID.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-in/values-in.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-in/values-in.xml
index 135b220cc..135b220cc 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-in/values-in.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-in/values-in.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-is/values-is.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-is/values-is.xml
index 6cd2b4662..6cd2b4662 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-is/values-is.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-is/values-is.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-it/values-it.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-it/values-it.xml
index b132e0147..b132e0147 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-it/values-it.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-it/values-it.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-iw/values-iw.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-iw/values-iw.xml
index f32890682..f32890682 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-iw/values-iw.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-iw/values-iw.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ja/values-ja.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ja/values-ja.xml
index 74add9a43..74add9a43 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ja/values-ja.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ja/values-ja.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ka-rGE/values-ka-rGE.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ka-rGE/values-ka-rGE.xml
index 6d234f420..6d234f420 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ka-rGE/values-ka-rGE.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ka-rGE/values-ka-rGE.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ka/values-ka.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ka/values-ka.xml
index d4c28d1ae..d4c28d1ae 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ka/values-ka.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ka/values-ka.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kk/values-kk.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kk/values-kk.xml
index a00d111a3..a00d111a3 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kk/values-kk.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kk/values-kk.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-km-rKH/values-km-rKH.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-km-rKH/values-km-rKH.xml
index 1964a39aa..1964a39aa 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-km-rKH/values-km-rKH.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-km-rKH/values-km-rKH.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-km/values-km.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-km/values-km.xml
index 1e2c123f8..1e2c123f8 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-km/values-km.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-km/values-km.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kn/values-kn.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kn/values-kn.xml
index 99cdffd61..99cdffd61 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kn/values-kn.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-kn/values-kn.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ko/values-ko.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ko/values-ko.xml
index 8b6c116bf..8b6c116bf 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ko/values-ko.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ko/values-ko.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ky/values-ky.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ky/values-ky.xml
index 2493032a1..2493032a1 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ky/values-ky.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ky/values-ky.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-land/values-land.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-land/values-land.xml
index b337bad0d..b337bad0d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-land/values-land.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-land/values-land.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-large-v4/values-large-v4.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-large-v4/values-large-v4.xml
index cc236ebd9..cc236ebd9 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-large-v4/values-large-v4.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-large-v4/values-large-v4.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ldltr-v21/values-ldltr-v21.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ldltr-v21/values-ldltr-v21.xml
index 1bdd835a6..1bdd835a6 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ldltr-v21/values-ldltr-v21.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ldltr-v21/values-ldltr-v21.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lo-rLA/values-lo-rLA.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lo-rLA/values-lo-rLA.xml
index bf2b123cb..bf2b123cb 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lo-rLA/values-lo-rLA.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lo-rLA/values-lo-rLA.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lo/values-lo.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lo/values-lo.xml
index a0c60bad7..a0c60bad7 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lo/values-lo.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lo/values-lo.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lt-rLT/values-lt-rLT.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lt-rLT/values-lt-rLT.xml
index decb7186f..decb7186f 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lt-rLT/values-lt-rLT.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lt-rLT/values-lt-rLT.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lt/values-lt.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lt/values-lt.xml
index 1409289c8..1409289c8 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lt/values-lt.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lt/values-lt.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lv-rLV/values-lv-rLV.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lv-rLV/values-lv-rLV.xml
index 53b31839d..53b31839d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lv-rLV/values-lv-rLV.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lv-rLV/values-lv-rLV.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lv/values-lv.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lv/values-lv.xml
index 613f664e7..613f664e7 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lv/values-lv.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-lv/values-lv.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mk/values-mk.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mk/values-mk.xml
index b993d0eab..b993d0eab 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mk/values-mk.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mk/values-mk.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ml/values-ml.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ml/values-ml.xml
index e02d1db63..e02d1db63 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ml/values-ml.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ml/values-ml.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mn-rMN/values-mn-rMN.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mn-rMN/values-mn-rMN.xml
index 27e59be3d..27e59be3d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mn-rMN/values-mn-rMN.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mn-rMN/values-mn-rMN.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mn/values-mn.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mn/values-mn.xml
index bc9afb3e1..bc9afb3e1 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mn/values-mn.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mn/values-mn.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mr/values-mr.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mr/values-mr.xml
index e69e00178..e69e00178 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mr/values-mr.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-mr/values-mr.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ms-rMY/values-ms-rMY.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ms-rMY/values-ms-rMY.xml
index e22776b80..e22776b80 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ms-rMY/values-ms-rMY.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ms-rMY/values-ms-rMY.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ms/values-ms.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ms/values-ms.xml
index 0bb98d2f5..0bb98d2f5 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ms/values-ms.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ms/values-ms.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-my/values-my.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-my/values-my.xml
index f5e479c3f..f5e479c3f 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-my/values-my.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-my/values-my.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nb/values-nb.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nb/values-nb.xml
index af1a900e9..af1a900e9 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nb/values-nb.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nb/values-nb.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ne-rNP/values-ne-rNP.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ne-rNP/values-ne-rNP.xml
index 305bdc1bb..305bdc1bb 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ne-rNP/values-ne-rNP.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ne-rNP/values-ne-rNP.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ne/values-ne.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ne/values-ne.xml
index bd2688563..bd2688563 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ne/values-ne.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ne/values-ne.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-night-v8/values-night-v8.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-night-v8/values-night-v8.xml
index 17a211063..17a211063 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-night-v8/values-night-v8.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-night-v8/values-night-v8.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nl/values-nl.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nl/values-nl.xml
index 9df3eca58..9df3eca58 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nl/values-nl.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-nl/values-nl.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pa/values-pa.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pa/values-pa.xml
index 9e62b2c35..9e62b2c35 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pa/values-pa.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pa/values-pa.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pl/values-pl.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pl/values-pl.xml
index 4fde6c432..4fde6c432 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pl/values-pl.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pl/values-pl.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-port/values-port.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-port/values-port.xml
index 7a925dc76..7a925dc76 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-port/values-port.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-port/values-port.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rBR/values-pt-rBR.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rBR/values-pt-rBR.xml
index fd255af3c..fd255af3c 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rBR/values-pt-rBR.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rBR/values-pt-rBR.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rPT/values-pt-rPT.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rPT/values-pt-rPT.xml
index 972b8885c..972b8885c 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rPT/values-pt-rPT.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt-rPT/values-pt-rPT.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt/values-pt.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt/values-pt.xml
index 2139e4bfd..2139e4bfd 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt/values-pt.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-pt/values-pt.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-rm/values-rm.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-rm/values-rm.xml
index e9e3f9e71..e9e3f9e71 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-rm/values-rm.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-rm/values-rm.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ro-rRO/values-ro-rRO.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ro-rRO/values-ro-rRO.xml
index decb7186f..decb7186f 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ro-rRO/values-ro-rRO.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ro-rRO/values-ro-rRO.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ro/values-ro.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ro/values-ro.xml
index 178b93625..178b93625 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ro/values-ro.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ro/values-ro.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ru/values-ru.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ru/values-ru.xml
index 7575af6fd..7575af6fd 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ru/values-ru.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ru/values-ru.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-si-rLK/values-si-rLK.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-si-rLK/values-si-rLK.xml
index 00dcc648d..00dcc648d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-si-rLK/values-si-rLK.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-si-rLK/values-si-rLK.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-si/values-si.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-si/values-si.xml
index aaf18958e..aaf18958e 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-si/values-si.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-si/values-si.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sk-rSK/values-sk-rSK.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sk-rSK/values-sk-rSK.xml
index 16b18ff6d..16b18ff6d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sk-rSK/values-sk-rSK.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sk-rSK/values-sk-rSK.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sk/values-sk.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sk/values-sk.xml
index b0005bb76..b0005bb76 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sk/values-sk.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sk/values-sk.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sl-rSI/values-sl-rSI.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sl-rSI/values-sl-rSI.xml
index decb7186f..decb7186f 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sl-rSI/values-sl-rSI.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sl-rSI/values-sl-rSI.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sl/values-sl.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sl/values-sl.xml
index 7882617e3..7882617e3 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sl/values-sl.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sl/values-sl.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sq/values-sq.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sq/values-sq.xml
index 0dc40eae4..0dc40eae4 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sq/values-sq.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sq/values-sq.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sr-rRS/values-sr-rRS.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sr-rRS/values-sr-rRS.xml
index 16b18ff6d..16b18ff6d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sr-rRS/values-sr-rRS.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sr-rRS/values-sr-rRS.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sr/values-sr.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sr/values-sr.xml
index d835b7158..d835b7158 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sr/values-sr.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sr/values-sr.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sv/values-sv.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sv/values-sv.xml
index 08b420c72..08b420c72 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sv/values-sv.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sv/values-sv.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw/values-sw.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw/values-sw.xml
index e19eb05bd..e19eb05bd 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw/values-sw.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw/values-sw.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw600dp-v13/values-sw600dp-v13.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw600dp-v13/values-sw600dp-v13.xml
index be7c95f3d..be7c95f3d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw600dp-v13/values-sw600dp-v13.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-sw600dp-v13/values-sw600dp-v13.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ta/values-ta.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ta/values-ta.xml
index fd1fabfea..fd1fabfea 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ta/values-ta.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ta/values-ta.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-te/values-te.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-te/values-te.xml
index 7e9888d77..7e9888d77 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-te/values-te.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-te/values-te.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-th-rTH/values-th-rTH.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-th-rTH/values-th-rTH.xml
index decb7186f..decb7186f 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-th-rTH/values-th-rTH.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-th-rTH/values-th-rTH.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-th/values-th.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-th/values-th.xml
index ac6b4a345..ac6b4a345 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-th/values-th.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-th/values-th.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tl/values-tl.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tl/values-tl.xml
index 64f1d4149..64f1d4149 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tl/values-tl.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tl/values-tl.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tr/values-tr.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tr/values-tr.xml
index fd976c041..fd976c041 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tr/values-tr.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-tr/values-tr.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uk-rUA/values-uk-rUA.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uk-rUA/values-uk-rUA.xml
index 53b31839d..53b31839d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uk-rUA/values-uk-rUA.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uk-rUA/values-uk-rUA.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uk/values-uk.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uk/values-uk.xml
index 11d25df0f..11d25df0f 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uk/values-uk.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uk/values-uk.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ur/values-ur.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ur/values-ur.xml
index 2c8a2fe18..2c8a2fe18 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ur/values-ur.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-ur/values-ur.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uz/values-uz.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uz/values-uz.xml
index 644683613..644683613 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uz/values-uz.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-uz/values-uz.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v11/values-v11.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v11/values-v11.xml
index 56f5c9d15..56f5c9d15 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v11/values-v11.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v11/values-v11.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v12/values-v12.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v12/values-v12.xml
index 85e241664..85e241664 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v12/values-v12.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v12/values-v12.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v13/values-v13.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v13/values-v13.xml
index 74d14088e..74d14088e 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v13/values-v13.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v13/values-v13.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v14/values-v14.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v14/values-v14.xml
index ea24d5360..ea24d5360 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v14/values-v14.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v14/values-v14.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v16/values-v16.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v16/values-v16.xml
index 5ee2feb23..5ee2feb23 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v16/values-v16.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v16/values-v16.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v17/values-v17.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v17/values-v17.xml
index f9f23d137..f9f23d137 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v17/values-v17.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v17/values-v17.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v18/values-v18.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v18/values-v18.xml
index 7dad77f9e..7dad77f9e 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v18/values-v18.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v18/values-v18.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v21/values-v21.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v21/values-v21.xml
index 00e721f4c..00e721f4c 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v21/values-v21.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v21/values-v21.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v22/values-v22.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v22/values-v22.xml
index d4a514a5f..d4a514a5f 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v22/values-v22.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v22/values-v22.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v23/values-v23.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v23/values-v23.xml
index d807aaeeb..d807aaeeb 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v23/values-v23.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v23/values-v23.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v24/values-v24.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v24/values-v24.xml
index 9649903a3..9649903a3 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v24/values-v24.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v24/values-v24.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v25/values-v25.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v25/values-v25.xml
index 483ae0c46..483ae0c46 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v25/values-v25.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v25/values-v25.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v26/values-v26.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v26/values-v26.xml
index 8b28a4651..8b28a4651 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v26/values-v26.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-v26/values-v26.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-vi-rVN/values-vi-rVN.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-vi-rVN/values-vi-rVN.xml
index 24948aa9d..24948aa9d 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-vi-rVN/values-vi-rVN.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-vi-rVN/values-vi-rVN.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-vi/values-vi.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-vi/values-vi.xml
index 830c6f947..830c6f947 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-vi/values-vi.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-vi/values-vi.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml
index b499d2cf3..b499d2cf3 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
index c5c0fde2a..c5c0fde2a 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rHK/values-zh-rHK.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rHK/values-zh-rHK.xml
index 4dbeadf5b..4dbeadf5b 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rHK/values-zh-rHK.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rHK/values-zh-rHK.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
index aa1e00cbd..aa1e00cbd 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zu/values-zu.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zu/values-zu.xml
index 4944d0951..4944d0951 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zu/values-zu.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-zu/values-zu.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values/values.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values/values.xml
index 8e883e7d8..8e883e7d8 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values/values.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values/values.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
index 7b7de68bc..7b7de68bc 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAssets/merger.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAssets/merger.xml
index 346abcfdc..346abcfdc 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugAssets/merger.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
index 6a4f6ecc4..6a4f6ecc4 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugShaders/merger.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugShaders/merger.xml
index 99d0f0669..99d0f0669 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/mergeDebugShaders/merger.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
index 85f891b3f..85f891b3f 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml
index 07506f5bf..07506f5bf 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml
diff --git a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/packageDebugResources/merger.xml b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/packageDebugResources/merger.xml
index 3953f1116..3953f1116 100644
--- a/Software/Android_Studio/Tango.Synchronization/build/intermediates/incremental/packageDebugResources/merger.xml
+++ b/Software/Android_Studio/Tango/Tango.Synchronization/build/intermediates/incremental/packageDebugResources/merger.xml
diff --git a/Software/Android_Studio/Tango.UnitTesting/.gitignore b/Software/Android_Studio/Tango/Tango.Transport/.gitignore
index 796b96d1c..796b96d1c 100644
--- a/Software/Android_Studio/Tango.UnitTesting/.gitignore
+++ b/Software/Android_Studio/Tango/Tango.Transport/.gitignore
diff --git a/Software/Android_Studio/Tango.Transport/build.gradle b/Software/Android_Studio/Tango/Tango.Transport/build.gradle
index 09ce4b6b7..09ce4b6b7 100644
--- a/Software/Android_Studio/Tango.Transport/build.gradle
+++ b/Software/Android_Studio/Tango/Tango.Transport/build.gradle
diff --git a/Software/Android_Studio/Tango.Transport/proguard-rules.pro b/Software/Android_Studio/Tango/Tango.Transport/proguard-rules.pro
index a0eef131a..a0eef131a 100644
--- a/Software/Android_Studio/Tango.Transport/proguard-rules.pro
+++ b/Software/Android_Studio/Tango/Tango.Transport/proguard-rules.pro
diff --git a/Software/Android_Studio/Tango.Transport/src/main/AndroidManifest.xml b/Software/Android_Studio/Tango/Tango.Transport/src/main/AndroidManifest.xml
index 73f3f3c0e..73f3f3c0e 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/AndroidManifest.xml
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/AndroidManifest.xml
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/ITransportAdapter.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/ITransportAdapter.java
index 0d46d9e0f..0d46d9e0f 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/ITransportAdapter.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/ITransportAdapter.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/ITransportComponent.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/ITransportComponent.java
index e195c280f..e195c280f 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/ITransportComponent.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/ITransportComponent.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/ITransportEncoder.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/ITransportEncoder.java
index 5279655ca..5279655ca 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/ITransportEncoder.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/ITransportEncoder.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/ITransporter.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/ITransporter.java
index 161a71dce..161a71dce 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/ITransporter.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/ITransporter.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/PendingResponse.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/PendingResponse.java
index 91106aba0..91106aba0 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/PendingResponse.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/PendingResponse.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/ResponseErrorException.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/ResponseErrorException.java
index 896e92b38..896e92b38 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/ResponseErrorException.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/ResponseErrorException.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/TransportAdapterBase.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/TransportAdapterBase.java
index b79492607..b79492607 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/TransportAdapterBase.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/TransportAdapterBase.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/TransportAdapterMode.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/TransportAdapterMode.java
index 699be758d..699be758d 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/TransportAdapterMode.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/TransportAdapterMode.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/TransportComponentState.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/TransportComponentState.java
index fb9fa7b60..fb9fa7b60 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/TransportComponentState.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/TransportComponentState.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/TransportMessage.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/TransportMessage.java
index 9978dd106..9978dd106 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/TransportMessage.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/TransportMessage.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/TransportMessageBase.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/TransportMessageBase.java
index 49d2fd31a..49d2fd31a 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/TransportMessageBase.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/TransportMessageBase.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/TransportMessageDirection.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/TransportMessageDirection.java
index ac01e8b57..ac01e8b57 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/TransportMessageDirection.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/TransportMessageDirection.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/TransporterBase.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/TransporterBase.java
index 66e7af393..66e7af393 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/TransporterBase.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/TransporterBase.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/TcpTransportAdapter.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/TcpTransportAdapter.java
index 129ceabdf..129ceabdf 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/TcpTransportAdapter.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/TcpTransportAdapter.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/UsbTransportAdapter.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/UsbTransportAdapter.java
index a12a0924d..a12a0924d 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/UsbTransportAdapter.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/adapters/UsbTransportAdapter.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/encoders/ProtoEncoder.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/encoders/ProtoEncoder.java
index 47d8b906f..47d8b906f 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/encoders/ProtoEncoder.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/encoders/ProtoEncoder.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/transporters/BasicTransporter.java b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/transporters/BasicTransporter.java
index aa6defd47..aa6defd47 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/java/com/twine/tango/transport/transporters/BasicTransporter.java
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/java/com/twine/tango/transport/transporters/BasicTransporter.java
diff --git a/Software/Android_Studio/Tango.Transport/src/main/res/values/strings.xml b/Software/Android_Studio/Tango/Tango.Transport/src/main/res/values/strings.xml
index f04af91fb..f04af91fb 100644
--- a/Software/Android_Studio/Tango.Transport/src/main/res/values/strings.xml
+++ b/Software/Android_Studio/Tango/Tango.Transport/src/main/res/values/strings.xml
diff --git a/Software/Android_Studio/Tango.Web/.gitignore b/Software/Android_Studio/Tango/Tango.UnitTesting/.gitignore
index 796b96d1c..796b96d1c 100644
--- a/Software/Android_Studio/Tango.Web/.gitignore
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/.gitignore
diff --git a/Software/Android_Studio/Tango.UnitTesting/build.gradle b/Software/Android_Studio/Tango/Tango.UnitTesting/build.gradle
index cb108d466..cb108d466 100644
--- a/Software/Android_Studio/Tango.UnitTesting/build.gradle
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/build.gradle
diff --git a/Software/Android_Studio/Tango.UnitTesting/proguard-rules.pro b/Software/Android_Studio/Tango/Tango.UnitTesting/proguard-rules.pro
index a0eef131a..a0eef131a 100644
--- a/Software/Android_Studio/Tango.UnitTesting/proguard-rules.pro
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/proguard-rules.pro
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/DAL_TST.java b/Software/Android_Studio/Tango/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/DAL_TST.java
index 5decde1d6..5decde1d6 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/DAL_TST.java
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/DAL_TST.java
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Logging_TST.java b/Software/Android_Studio/Tango/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Logging_TST.java
index 2f02ef972..2f02ef972 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Logging_TST.java
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Logging_TST.java
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/NativeBridge_TST.java b/Software/Android_Studio/Tango/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/NativeBridge_TST.java
index fc1758781..fc1758781 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/NativeBridge_TST.java
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/NativeBridge_TST.java
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Synchronization_TST.java b/Software/Android_Studio/Tango/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Synchronization_TST.java
index d7fef49bc..d7fef49bc 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Synchronization_TST.java
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/Synchronization_TST.java
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/AndroidManifest.xml b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/AndroidManifest.xml
index 89fc2427a..89fc2427a 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/AndroidManifest.xml
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/AndroidManifest.xml
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/java/com/twine/tango/unittesting/App.java b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/java/com/twine/tango/unittesting/App.java
index 6d81b7c32..6d81b7c32 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/java/com/twine/tango/unittesting/App.java
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/java/com/twine/tango/unittesting/App.java
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/java/com/twine/tango/unittesting/MainActivity.java b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/java/com/twine/tango/unittesting/MainActivity.java
index 4be88237d..4be88237d 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/java/com/twine/tango/unittesting/MainActivity.java
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/java/com/twine/tango/unittesting/MainActivity.java
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/drawable/ic_launcher_background.xml b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/drawable/ic_launcher_background.xml
index 1cd2a3665..1cd2a3665 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/drawable/ic_launcher_background.xml
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/drawable/ic_launcher_background.xml
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/layout/activity_main.xml b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/layout/activity_main.xml
index 9cdd121ea..9cdd121ea 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/layout/activity_main.xml
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/layout/activity_main.xml
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 00f9eaaf3..00f9eaaf3 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 00f9eaaf3..00f9eaaf3 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-hdpi/ic_launcher.png b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-hdpi/ic_launcher.png
index 550730310..550730310 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index 4e526c95b..4e526c95b 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-hdpi/ic_launcher_round.png b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-hdpi/ic_launcher_round.png
index 8fab6a3a5..8fab6a3a5 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-mdpi/ic_launcher.png b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-mdpi/ic_launcher.png
index 6bc7fcd6f..6bc7fcd6f 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
index 2c38c7190..2c38c7190 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-mdpi/ic_launcher_round.png b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-mdpi/ic_launcher_round.png
index 1eecc0e7d..1eecc0e7d 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xhdpi/ic_launcher.png b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xhdpi/ic_launcher.png
index ec87dcebe..ec87dcebe 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
index 072467eaa..072467eaa 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index 05ca079ca..05ca079ca 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 6f67f21ba..6f67f21ba 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
index 78a6b7a34..78a6b7a34 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index 8bac0f274..8bac0f274 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 0327e13fa..0327e13fa 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 68ebe33fe..68ebe33fe 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index bacd3e758..bacd3e758 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/values/colors.xml b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/values/colors.xml
index 3ab3e9cbc..3ab3e9cbc 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/values/colors.xml
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/values/colors.xml
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/main/res/values/strings.xml b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/values/strings.xml
index 76b425acf..76b425acf 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/main/res/values/strings.xml
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/values/strings.xml
diff --git a/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/values/styles.xml b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/values/styles.xml
new file mode 100644
index 000000000..5885930df
--- /dev/null
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/test/java/com/twine/tango/unittesting/ExampleUnitTest.java b/Software/Android_Studio/Tango/Tango.UnitTesting/src/test/java/com/twine/tango/unittesting/ExampleUnitTest.java
index 9c8cf8626..9c8cf8626 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/test/java/com/twine/tango/unittesting/ExampleUnitTest.java
+++ b/Software/Android_Studio/Tango/Tango.UnitTesting/src/test/java/com/twine/tango/unittesting/ExampleUnitTest.java
diff --git a/Software/Android_Studio/Tango.UnitTests/build/intermediates/incremental/compileDebugAidl/dependency.store b/Software/Android_Studio/Tango/Tango.UnitTests/build/intermediates/incremental/compileDebugAidl/dependency.store
index 8b8400dcf..8b8400dcf 100644
--- a/Software/Android_Studio/Tango.UnitTests/build/intermediates/incremental/compileDebugAidl/dependency.store
+++ b/Software/Android_Studio/Tango/Tango.UnitTests/build/intermediates/incremental/compileDebugAidl/dependency.store
diff --git a/Software/Android_Studio/Tango/Tango.Web/.gitignore b/Software/Android_Studio/Tango/Tango.Web/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/Software/Android_Studio/Tango/Tango.Web/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/Software/Android_Studio/Tango.Web/build.gradle b/Software/Android_Studio/Tango/Tango.Web/build.gradle
index f064794e1..f064794e1 100644
--- a/Software/Android_Studio/Tango.Web/build.gradle
+++ b/Software/Android_Studio/Tango/Tango.Web/build.gradle
diff --git a/Software/Android_Studio/Tango.Web/proguard-rules.pro b/Software/Android_Studio/Tango/Tango.Web/proguard-rules.pro
index a0eef131a..a0eef131a 100644
--- a/Software/Android_Studio/Tango.Web/proguard-rules.pro
+++ b/Software/Android_Studio/Tango/Tango.Web/proguard-rules.pro
diff --git a/Software/Android_Studio/Tango.Web/src/main/AndroidManifest.xml b/Software/Android_Studio/Tango/Tango.Web/src/main/AndroidManifest.xml
index 8978fcb47..8978fcb47 100644
--- a/Software/Android_Studio/Tango.Web/src/main/AndroidManifest.xml
+++ b/Software/Android_Studio/Tango/Tango.Web/src/main/AndroidManifest.xml
diff --git a/Software/Android_Studio/Tango.Web/src/main/java/com/twine/tango/web/ISynchronizationAPI.java b/Software/Android_Studio/Tango/Tango.Web/src/main/java/com/twine/tango/web/ISynchronizationAPI.java
index 3a3d34c3a..3a3d34c3a 100644
--- a/Software/Android_Studio/Tango.Web/src/main/java/com/twine/tango/web/ISynchronizationAPI.java
+++ b/Software/Android_Studio/Tango/Tango.Web/src/main/java/com/twine/tango/web/ISynchronizationAPI.java
diff --git a/Software/Android_Studio/Tango.Web/src/main/java/com/twine/tango/web/WebApiFactory.java b/Software/Android_Studio/Tango/Tango.Web/src/main/java/com/twine/tango/web/WebApiFactory.java
index cc72dbece..cc72dbece 100644
--- a/Software/Android_Studio/Tango.Web/src/main/java/com/twine/tango/web/WebApiFactory.java
+++ b/Software/Android_Studio/Tango/Tango.Web/src/main/java/com/twine/tango/web/WebApiFactory.java
diff --git a/Software/Android_Studio/Tango.Web/src/main/res/values/strings.xml b/Software/Android_Studio/Tango/Tango.Web/src/main/res/values/strings.xml
index 5ca3432a7..5ca3432a7 100644
--- a/Software/Android_Studio/Tango.Web/src/main/res/values/strings.xml
+++ b/Software/Android_Studio/Tango/Tango.Web/src/main/res/values/strings.xml
diff --git a/Software/Android_Studio/build.gradle b/Software/Android_Studio/Tango/build.gradle
index d9421626b..d9421626b 100644
--- a/Software/Android_Studio/build.gradle
+++ b/Software/Android_Studio/Tango/build.gradle
diff --git a/Software/Android_Studio/gradle.properties b/Software/Android_Studio/Tango/gradle.properties
index aac7c9b46..aac7c9b46 100644
--- a/Software/Android_Studio/gradle.properties
+++ b/Software/Android_Studio/Tango/gradle.properties
diff --git a/Software/Android_Studio/gradle/wrapper/gradle-wrapper.jar b/Software/Android_Studio/Tango/gradle/wrapper/gradle-wrapper.jar
index 13372aef5..13372aef5 100644
--- a/Software/Android_Studio/gradle/wrapper/gradle-wrapper.jar
+++ b/Software/Android_Studio/Tango/gradle/wrapper/gradle-wrapper.jar
diff --git a/Software/Android_Studio/gradle/wrapper/gradle-wrapper.properties b/Software/Android_Studio/Tango/gradle/wrapper/gradle-wrapper.properties
index d86868739..d86868739 100644
--- a/Software/Android_Studio/gradle/wrapper/gradle-wrapper.properties
+++ b/Software/Android_Studio/Tango/gradle/wrapper/gradle-wrapper.properties
diff --git a/Software/Android_Studio/gradlew b/Software/Android_Studio/Tango/gradlew
index 9d82f7891..9d82f7891 100644
--- a/Software/Android_Studio/gradlew
+++ b/Software/Android_Studio/Tango/gradlew
diff --git a/Software/Android_Studio/gradlew.bat b/Software/Android_Studio/Tango/gradlew.bat
index 8a0b282aa..8a0b282aa 100644
--- a/Software/Android_Studio/gradlew.bat
+++ b/Software/Android_Studio/Tango/gradlew.bat
diff --git a/Software/Android_Studio/settings.gradle b/Software/Android_Studio/Tango/settings.gradle
index 77d1d0863..77d1d0863 100644
--- a/Software/Android_Studio/settings.gradle
+++ b/Software/Android_Studio/Tango/settings.gradle