Started working on 'Synchronization' - Machine Studio module.

18 files changed, 108 insertions, 20 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs
index df8ed6d2f..410d0309c 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs
@@ -18,5 +18,7 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public double VERSION { get; set; }
+        public string NAME { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_FIRMWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_FIRMWARE_VERSIONS.cs
index 3cf9cd3ce..dca8e82f1 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_FIRMWARE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_FIRMWARE_VERSIONS.cs
@@ -18,5 +18,7 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public double VERSION { get; set; }
+        public string NAME { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_OS_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_OS_VERSIONS.cs
index a3d4afab8..c05a2410c 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_OS_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_OS_VERSIONS.cs
@@ -18,5 +18,7 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public double VERSION { get; set; }
+        public string NAME { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_VERSIONS.cs
index 7ef6c94cb..c250201d0 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_VERSIONS.cs
@@ -18,5 +18,7 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public double VERSION { get; set; }
+        public string NAME { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE_TYPES.cs
index 87d05642b..6d8e2d441 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE_TYPES.cs
@@ -18,5 +18,7 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public long CODE { get; set; }
+        public string NAME { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER_TYPES.cs
index f66752a5e..718ab5219 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER_TYPES.cs
@@ -18,5 +18,7 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public long CODE { get; set; }
+        public string NAME { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_FIRMWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_FIRMWARE_VERSIONS.cs
index d44343495..b4f3c3c85 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_FIRMWARE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_FIRMWARE_VERSIONS.cs
@@ -18,5 +18,7 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public double VERSION { get; set; }
+        public string NAME { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_SOFTWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_SOFTWARE_VERSIONS.cs
index a0b0a7b22..117295091 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_SOFTWARE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_SOFTWARE_VERSIONS.cs
@@ -18,5 +18,7 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public double VERSION { get; set; }
+        public string NAME { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs
index 3ec964cb8..af7b10d05 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs
@@ -18,6 +18,7 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public long CODE { get; set; }
         public string NAME { get; set; }
         public string DESCRIPTION { get; set; }
     }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SYNTHESISES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SYNTHS.cs
index f6667a7c1..668872f68 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SYNTHESISES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SYNTHS.cs
@@ -12,7 +12,7 @@ namespace Tango.DAL.Local.DB
     using System;
     using System.Collections.Generic;
     
-    public partial class FIBER_SYNTHESISES
+    public partial class FIBER_SYNTHS
     {
         public long ID { get; set; }
         public string GUID { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/HARDWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/HARDWARE_VERSIONS.cs
index 0ceb68f7c..62b93a878 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/HARDWARE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/HARDWARE_VERSIONS.cs
@@ -18,5 +18,7 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public double VERSION { get; set; }
+        public string NAME { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs
index 652d219ba..16e069ef1 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs
@@ -21,5 +21,6 @@ namespace Tango.DAL.Local.DB
         public long CODE { get; set; }
         public string NAME { get; set; }
         public double VERSION { get; set; }
+        public long COLOR { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
index 10f77068c..24df1c1ce 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
@@ -42,7 +42,7 @@ namespace Tango.DAL.Local.DB
         public virtual DbSet<EVENT_TYPES> EVENT_TYPES { get; set; }
         public virtual DbSet<EVENT_TYPES_ACTIONS> EVENT_TYPES_ACTIONS { get; set; }
         public virtual DbSet<FIBER_SHAPES> FIBER_SHAPES { get; set; }
-        public virtual DbSet<FIBER_SYNTHESISES> FIBER_SYNTHESISES { get; set; }
+        public virtual DbSet<FIBER_SYNTHS> FIBER_SYNTHS { get; set; }
         public virtual DbSet<HARDWARE_VERSIONS> HARDWARE_VERSIONS { get; set; }
         public virtual DbSet<IDS_PACKS> IDS_PACKS { get; set; }
         public virtual DbSet<LINEAR_MASS_DENSITY_UNITS> LINEAR_MASS_DENSITY_UNITS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
index 261cec120..aa2095368 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
@@ -41,6 +41,8 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="VERSION" Type="real" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="APPLICATION_FIRMWARE_VERSIONS">
           <Key>
@@ -50,6 +52,8 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="VERSION" Type="real" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="APPLICATION_OS_VERSIONS">
           <Key>
@@ -59,6 +63,8 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="VERSION" Type="real" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="APPLICATION_VERSIONS">
           <Key>
@@ -68,6 +74,8 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="VERSION" Type="real" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="CARTRIDGE_TYPES">
           <Key>
@@ -77,6 +85,8 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="CODE" Type="integer" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="CARTRIDGES">
           <Key>
@@ -129,6 +139,8 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="CODE" Type="integer" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="DISPENSERS">
           <Key>
@@ -148,6 +160,8 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="VERSION" Type="real" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="EMBEDDED_SOFTWARE_VERSIONS">
           <Key>
@@ -157,6 +171,8 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="VERSION" Type="real" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="EVENT_TYPES">
           <Key>
@@ -166,6 +182,7 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="CODE" Type="integer" Nullable="false" />
           <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
@@ -189,7 +206,7 @@
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
         </EntityType>
-        <EntityType Name="FIBER_SYNTHESISES">
+        <EntityType Name="FIBER_SYNTHS">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -206,6 +223,8 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="VERSION" Type="real" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="IDS_PACKS">
           <Key>
@@ -240,6 +259,7 @@
           <Property Name="CODE" Type="integer" Nullable="false" />
           <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="VERSION" Type="real" Nullable="false" />
+          <Property Name="COLOR" Type="integer" Nullable="false" />
         </EntityType>
         <EntityType Name="LIQUID_TYPES_RMLS">
           <Key>
@@ -260,7 +280,9 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="VERSION" Type="real" Nullable="false" />
+          <Property Name="DEFAULT_CONFIGURATION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="MACHINES">
           <Key>
@@ -378,7 +400,7 @@
           <Property Name="CONDITION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LINEAR_MASS_DENSITY_UNIT_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="FIBER_SHAPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-          <Property Name="FIBER_SYNTHESIS_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="FIBER_SYNTH_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="FIBER_SIZE" Type="real" Nullable="false" />
           <Property Name="NUMBER_OF_FIBERS" Type="integer" Nullable="false" />
           <Property Name="PLIES_PER_FIBER" Type="integer" Nullable="false" />
@@ -464,7 +486,7 @@
           <EntitySet Name="EVENT_TYPES" EntityType="Self.EVENT_TYPES" store:Type="Tables" />
           <EntitySet Name="EVENT_TYPES_ACTIONS" EntityType="Self.EVENT_TYPES_ACTIONS" store:Type="Tables" />
           <EntitySet Name="FIBER_SHAPES" EntityType="Self.FIBER_SHAPES" store:Type="Tables" />
-          <EntitySet Name="FIBER_SYNTHESISES" EntityType="Self.FIBER_SYNTHESISES" store:Type="Tables" />
+          <EntitySet Name="FIBER_SYNTHS" EntityType="Self.FIBER_SYNTHS" store:Type="Tables" />
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="Self.HARDWARE_VERSIONS" store:Type="Tables" />
           <EntitySet Name="IDS_PACKS" EntityType="Self.IDS_PACKS" store:Type="Tables" />
           <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="Self.LINEAR_MASS_DENSITY_UNITS" store:Type="Tables" />
@@ -509,7 +531,7 @@
           <EntitySet Name="EVENT_TYPES" EntityType="LocalModel.EVENT_TYPES" />
           <EntitySet Name="EVENT_TYPES_ACTIONS" EntityType="LocalModel.EVENT_TYPES_ACTIONS" />
           <EntitySet Name="FIBER_SHAPES" EntityType="LocalModel.FIBER_SHAPES" />
-          <EntitySet Name="FIBER_SYNTHESISES" EntityType="LocalModel.FIBER_SYNTHESISES" />
+          <EntitySet Name="FIBER_SYNTHS" EntityType="LocalModel.FIBER_SYNTHS" />
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="LocalModel.HARDWARE_VERSIONS" />
           <EntitySet Name="IDS_PACKS" EntityType="LocalModel.IDS_PACKS" />
           <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" />
@@ -568,6 +590,8 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="VERSION" Type="Double" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="APPLICATION_FIRMWARE_VERSIONS">
           <Key>
@@ -577,6 +601,8 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="VERSION" Type="Double" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="APPLICATION_OS_VERSIONS">
           <Key>
@@ -586,6 +612,8 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="VERSION" Type="Double" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="APPLICATION_VERSIONS">
           <Key>
@@ -595,6 +623,8 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="VERSION" Type="Double" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="CARTRIDGE_TYPES">
           <Key>
@@ -604,6 +634,8 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="CODE" Type="Int64" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="CARTRIDGE">
           <Key>
@@ -656,6 +688,8 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="CODE" Type="Int64" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="DISPENSER">
           <Key>
@@ -675,6 +709,8 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="VERSION" Type="Double" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="EMBEDDED_SOFTWARE_VERSIONS">
           <Key>
@@ -684,6 +720,8 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="VERSION" Type="Double" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="EVENT_TYPES">
           <Key>
@@ -693,6 +731,7 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="CODE" Type="Int64" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
@@ -716,7 +755,7 @@
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
         </EntityType>
-        <EntityType Name="FIBER_SYNTHESISES">
+        <EntityType Name="FIBER_SYNTHS">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -733,6 +772,8 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="VERSION" Type="Double" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="IDS_PACKS">
           <Key>
@@ -767,6 +808,7 @@
           <Property Name="CODE" Type="Int64" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="VERSION" Type="Double" Nullable="false" />
+          <Property Name="COLOR" Type="Int64" Nullable="false" />
         </EntityType>
         <EntityType Name="LIQUID_TYPES_RMLS">
           <Key>
@@ -787,7 +829,9 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="VERSION" Type="Double" Nullable="false" />
+          <Property Name="DEFAULT_CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="MACHINE">
           <Key>
@@ -905,7 +949,7 @@
           <Property Name="CONDITION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LINEAR_MASS_DENSITY_UNIT_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="FIBER_SHAPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-          <Property Name="FIBER_SYNTHESIS_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="FIBER_SYNTH_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="FIBER_SIZE" Type="Double" Nullable="false" />
           <Property Name="NUMBER_OF_FIBERS" Type="Int64" Nullable="false" />
           <Property Name="PLIES_PER_FIBER" Type="Int64" Nullable="false" />
@@ -1012,6 +1056,8 @@
           <EntitySetMapping Name="APPLICATION_DISPLAY_PANEL_VERSIONS">
             <EntityTypeMapping TypeName="LocalModel.APPLICATION_DISPLAY_PANEL_VERSIONS">
               <MappingFragment StoreEntitySet="APPLICATION_DISPLAY_PANEL_VERSIONS">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="VERSION" ColumnName="VERSION" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1022,6 +1068,8 @@
           <EntitySetMapping Name="APPLICATION_FIRMWARE_VERSIONS">
             <EntityTypeMapping TypeName="LocalModel.APPLICATION_FIRMWARE_VERSIONS">
               <MappingFragment StoreEntitySet="APPLICATION_FIRMWARE_VERSIONS">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="VERSION" ColumnName="VERSION" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1032,6 +1080,8 @@
           <EntitySetMapping Name="APPLICATION_OS_VERSIONS">
             <EntityTypeMapping TypeName="LocalModel.APPLICATION_OS_VERSIONS">
               <MappingFragment StoreEntitySet="APPLICATION_OS_VERSIONS">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="VERSION" ColumnName="VERSION" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1042,6 +1092,8 @@
           <EntitySetMapping Name="APPLICATION_VERSIONS">
             <EntityTypeMapping TypeName="LocalModel.APPLICATION_VERSIONS">
               <MappingFragment StoreEntitySet="APPLICATION_VERSIONS">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="VERSION" ColumnName="VERSION" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1052,6 +1104,8 @@
           <EntitySetMapping Name="CARTRIDGE_TYPES">
             <EntityTypeMapping TypeName="LocalModel.CARTRIDGE_TYPES">
               <MappingFragment StoreEntitySet="CARTRIDGE_TYPES">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="CODE" ColumnName="CODE" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1108,6 +1162,8 @@
           <EntitySetMapping Name="DISPENSER_TYPES">
             <EntityTypeMapping TypeName="LocalModel.DISPENSER_TYPES">
               <MappingFragment StoreEntitySet="DISPENSER_TYPES">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="CODE" ColumnName="CODE" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1129,6 +1185,8 @@
           <EntitySetMapping Name="EMBEDDED_FIRMWARE_VERSIONS">
             <EntityTypeMapping TypeName="LocalModel.EMBEDDED_FIRMWARE_VERSIONS">
               <MappingFragment StoreEntitySet="EMBEDDED_FIRMWARE_VERSIONS">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="VERSION" ColumnName="VERSION" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1139,6 +1197,8 @@
           <EntitySetMapping Name="EMBEDDED_SOFTWARE_VERSIONS">
             <EntityTypeMapping TypeName="LocalModel.EMBEDDED_SOFTWARE_VERSIONS">
               <MappingFragment StoreEntitySet="EMBEDDED_SOFTWARE_VERSIONS">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="VERSION" ColumnName="VERSION" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1151,6 +1211,7 @@
               <MappingFragment StoreEntitySet="EVENT_TYPES">
                 <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="CODE" ColumnName="CODE" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1180,9 +1241,9 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="FIBER_SYNTHESISES">
-            <EntityTypeMapping TypeName="LocalModel.FIBER_SYNTHESISES">
-              <MappingFragment StoreEntitySet="FIBER_SYNTHESISES">
+          <EntitySetMapping Name="FIBER_SYNTHS">
+            <EntityTypeMapping TypeName="LocalModel.FIBER_SYNTHS">
+              <MappingFragment StoreEntitySet="FIBER_SYNTHS">
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1193,6 +1254,8 @@
           <EntitySetMapping Name="HARDWARE_VERSIONS">
             <EntityTypeMapping TypeName="LocalModel.HARDWARE_VERSIONS">
               <MappingFragment StoreEntitySet="HARDWARE_VERSIONS">
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="VERSION" ColumnName="VERSION" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1227,6 +1290,7 @@
           <EntitySetMapping Name="LIQUID_TYPES">
             <EntityTypeMapping TypeName="LocalModel.LIQUID_TYPES">
               <MappingFragment StoreEntitySet="LIQUID_TYPES">
+                <ScalarProperty Name="COLOR" ColumnName="COLOR" />
                 <ScalarProperty Name="VERSION" ColumnName="VERSION" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="CODE" ColumnName="CODE" />
@@ -1252,7 +1316,9 @@
           <EntitySetMapping Name="MACHINE_VERSIONS">
             <EntityTypeMapping TypeName="LocalModel.MACHINE_VERSIONS">
               <MappingFragment StoreEntitySet="MACHINE_VERSIONS">
+                <ScalarProperty Name="DEFAULT_CONFIGURATION_GUID" ColumnName="DEFAULT_CONFIGURATION_GUID" />
                 <ScalarProperty Name="VERSION" ColumnName="VERSION" />
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1383,7 +1449,7 @@
                 <ScalarProperty Name="PLIES_PER_FIBER" ColumnName="PLIES_PER_FIBER" />
                 <ScalarProperty Name="NUMBER_OF_FIBERS" ColumnName="NUMBER_OF_FIBERS" />
                 <ScalarProperty Name="FIBER_SIZE" ColumnName="FIBER_SIZE" />
-                <ScalarProperty Name="FIBER_SYNTHESIS_GUID" ColumnName="FIBER_SYNTHESIS_GUID" />
+                <ScalarProperty Name="FIBER_SYNTH_GUID" ColumnName="FIBER_SYNTH_GUID" />
                 <ScalarProperty Name="FIBER_SHAPE_GUID" ColumnName="FIBER_SHAPE_GUID" />
                 <ScalarProperty Name="LINEAR_MASS_DENSITY_UNIT_GUID" ColumnName="LINEAR_MASS_DENSITY_UNIT_GUID" />
                 <ScalarProperty Name="CONDITION_GUID" ColumnName="CONDITION_GUID" />
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
index 5bbf17d24..f36a25560 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
@@ -22,16 +22,16 @@
         <EntityTypeShape EntityType="LocalModel.EVENT_TYPES" Width="1.5" PointX="8.75" PointY="9.75" />
         <EntityTypeShape EntityType="LocalModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="10.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="10.75" />
-        <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHESISES" Width="1.5" PointX="10.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHS" Width="1.5" PointX="10.75" PointY="3.75" />
         <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="10.75" PointY="6.75" />
         <EntityTypeShape EntityType="LocalModel.IDS_PACKS" Width="1.5" PointX="10.75" PointY="9.75" />
         <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="2.75" PointY="11.75" />
         <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES" Width="1.5" PointX="4.75" PointY="11.75" />
         <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="12.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="12.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="12.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="6.75" PointY="12.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="12.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="12.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="12.75" PointY="11.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="6.75" PointY="13.75" />
         <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="8.75" PointY="13.75" />
         <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="14.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="14.75" />
@@ -42,8 +42,8 @@
         <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="12.75" PointY="14.75" />
         <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.75" PointY="14.75" />
         <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="2.75" PointY="15.75" />
-        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="4.75" PointY="15.75" />
-        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="16.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="16.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="16.75" PointY="4.75" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE_VERSIONS.cs
index 987d5b501..482c5ff01 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE_VERSIONS.cs
@@ -18,6 +18,8 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public string NAME { get; set; }
         public double VERSION { get; set; }
+        public string DEFAULT_CONFIGURATION_GUID { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs
index 6761a538f..8b7723d95 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs
@@ -25,7 +25,7 @@ namespace Tango.DAL.Local.DB
         public string CONDITION_GUID { get; set; }
         public string LINEAR_MASS_DENSITY_UNIT_GUID { get; set; }
         public string FIBER_SHAPE_GUID { get; set; }
-        public string FIBER_SYNTHESIS_GUID { get; set; }
+        public string FIBER_SYNTH_GUID { get; set; }
         public double FIBER_SIZE { get; set; }
         public long NUMBER_OF_FIBERS { get; set; }
         public long PLIES_PER_FIBER { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
index 14625e59f..b37074e7f 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
@@ -116,7 +116,7 @@
     <Compile Include="DB\FIBER_SHAPES.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\FIBER_SYNTHESISES.cs">
+    <Compile Include="DB\FIBER_SYNTHS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
     <Compile Include="DB\HARDWARE_VERSIONS.cs">