Fixed a few issues with PPC events and memory leak.

Changed color space PANTON to Coats.
Modified JobProgressBarItem in PPC to display the proper duration.

12 files changed, 187 insertions, 214 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppBarItems/JobProgressAppBarItemView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppBarItems/JobProgressAppBarItemView.xaml
index 5e193edbf..cdc28335d 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppBarItems/JobProgressAppBarItemView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppBarItems/JobProgressAppBarItemView.xaml
@@ -10,11 +10,11 @@
         <touch:TouchButton Style="{StaticResource TangoFlatButton}" Command="{Binding PressedCommand}" Padding="0">
             <StackPanel VerticalAlignment="Center">
                 <TextBlock Text="{Binding MachineProvider.MachineOperator.RunningJob.Name,FallbackValue='Job Name'}" FontSize="{StaticResource TangoTitleFontSize}"></TextBlock>
-                <ProgressBar Maximum="{Binding MachineProvider.MachineOperator.RunningJobStatus.TotalProgress}" Value="{Binding MachineProvider.MachineOperator.RunningJobStatus.Progress}" Margin="0 10 0 5" Background="{StaticResource TangoGrayBrush}" Height="5" Foreground="{StaticResource TangoPrimaryAccentBrush}" BorderThickness="0" />
+                <ProgressBar Maximum="{Binding MachineProvider.MachineOperator.RunningJobStatus.TotalProgressMinusSettingUp}" Value="{Binding MachineProvider.MachineOperator.RunningJobStatus.ProgressMinusSettingUp}" Margin="0 10 0 5" Background="{StaticResource TangoGrayBrush}" Height="5" Foreground="{StaticResource TangoPrimaryAccentBrush}" BorderThickness="0" />
                 <DockPanel LastChildFill="False">
                     <TextBlock DockPanel.Dock="Left">
                                             <Run>Completed</Run>
-                                            <Run Text="{Binding MachineProvider.MachineOperator.RunningJobStatus.Progress,StringFormat=0}"></Run><Run>/</Run><Run Text="{Binding MachineProvider.MachineOperator.RunningJobStatus.TotalProgress,StringFormat=0}"></Run><Run>m</Run>
+                                            <Run Text="{Binding MachineProvider.MachineOperator.RunningJobStatus.ProgressMinusSettingUp,StringFormat=0}"></Run><Run>/</Run><Run Text="{Binding MachineProvider.MachineOperator.RunningJobStatus.TotalProgressMinusSettingUp,StringFormat=0}"></Run><Run>m</Run>
                     </TextBlock>
 
                     <TextBlock DockPanel.Dock="Right">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Converters/ColorSpaceToVisibilityConverter.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Converters/ColorSpaceToVisibilityConverter.cs
index 4bfc08e62..f7e3bb282 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Converters/ColorSpaceToVisibilityConverter.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Converters/ColorSpaceToVisibilityConverter.cs
@@ -18,7 +18,7 @@ namespace Tango.PPC.Jobs.Converters
 
             if (colorSpace != null)
             {
-                if (colorSpace.Space == BL.Enumerations.ColorSpaces.Twine || colorSpace.Space == BL.Enumerations.ColorSpaces.PANTON)
+                if (colorSpace.Space == BL.Enumerations.ColorSpaces.Twine || colorSpace.Space == BL.Enumerations.ColorSpaces.Coats)
                 {
                     return Visibility.Collapsed;
                 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml
index fe483420a..897810c99 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml
@@ -66,7 +66,7 @@
                                 </touch:TouchStaticListBox.ItemContainerStyle>
                                 <touch:TouchStaticListBox.ItemTemplate>
                                     <DataTemplate>
-                                        <StackPanel Margin="10">
+                                        <StackPanel Margin="10" Width="70">
                                             <Ellipse Width="60" Height="60" Fill="{Binding Brush}" />
                                             <TextBlock Margin="0 5 0 0" HorizontalAlignment="Center" Text="{Binding Name}"></TextBlock>
                                         </StackPanel>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
index c6c9794d3..880d4e9f3 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
@@ -513,7 +513,7 @@ namespace Tango.BL.Entities
         {
             try
             {
-                if (BrushColorSpace == ColorSpaces.Twine || BrushColorSpace == ColorSpaces.PANTON)
+                if (BrushColorSpace == ColorSpaces.Twine || BrushColorSpace == ColorSpaces.Coats)
                 {
                     if (ColorCatalog != null)
                     {
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs b/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs
index 1bfc5995d..af626837e 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs
@@ -44,10 +44,10 @@ namespace Tango.BL.Enumerations
         LAB = 3,
 
         /// <summary>
-        /// (PANTON)
+        /// (Coats)
         /// </summary>
-        [Description("PANTON")]
-        PANTON = 4,
+        [Description("Coats")]
+        Coats = 4,
 
         /// <summary>
         /// (Twine Catalog)
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs
index d7cd58949..41fb57bad 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs
@@ -128,6 +128,12 @@ namespace Tango.BL.Enumerations
         RunHardwareVersionsModule = 19,
 
         /// <summary>
+        /// (Allows running the ColorCapture module in Machine Studio)
+        /// </summary>
+        [Description("Allows running the ColorCapture module in Machine Studio")]
+        RunColorCaptureModule = 24,
+
+        /// <summary>
         /// (Allows publishing of new PPC application versions.)
         /// </summary>
         [Description("Allows publishing of new PPC application versions.")]
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs
index e173a109f..d40ee52db 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs
@@ -86,6 +86,12 @@ namespace Tango.BL.Enumerations
         MachineStudioUser = 14,
 
         /// <summary>
+        /// (Twine color capture application tester/user.)
+        /// </summary>
+        [Description("Twine color capture application tester/user.")]
+        TCCUser = 15,
+
+        /// <summary>
         /// (PPC Application Publisher)
         /// </summary>
         [Description("PPC Application Publisher")]
diff --git a/Software/Visual_Studio/Tango.Core/ExtensionMethods/FrameworkElementExtensions.cs b/Software/Visual_Studio/Tango.Core/ExtensionMethods/FrameworkElementExtensions.cs
index 909366ffd..ca546922f 100644
--- a/Software/Visual_Studio/Tango.Core/ExtensionMethods/FrameworkElementExtensions.cs
+++ b/Software/Visual_Studio/Tango.Core/ExtensionMethods/FrameworkElementExtensions.cs
@@ -23,8 +23,15 @@ public static class FrameworkElementExtensions
     private static List<ElementEventsContainer> _containers = new List<ElementEventsContainer>();
     private class ElementEventsContainer
     {
+        public String Token { get; set; }
         public EventHandler<MouseOrTouchEventArgs> Handler { get; set; }
+        public FrameworkElement Element { get; set; }
         public Action Clear { get; set; }
+
+        public ElementEventsContainer()
+        {
+            Token = Guid.NewGuid().ToString();
+        }
     }
 
     /// <summary>
@@ -33,7 +40,7 @@ public static class FrameworkElementExtensions
     /// <param name="element">The element.</param>
     /// <param name="relativeTo">The relative to.</param>
     /// <param name="handler">The handler.</param>
-    public static void RegisterForMouseOrTouchDown(this FrameworkElement element, FrameworkElement relativeTo, EventHandler<MouseOrTouchEventArgs> handler)
+    public static String RegisterForMouseOrTouchDown(this FrameworkElement element, FrameworkElement relativeTo, EventHandler<MouseOrTouchEventArgs> handler)
     {
         bool mousePressed = false;
         bool touchDown = false;
@@ -106,6 +113,7 @@ public static class FrameworkElementExtensions
 
         ElementEventsContainer container = new ElementEventsContainer();
         container.Handler = handler;
+        container.Element = element;
         container.Clear = () => 
         {
             element.MouseUp -= mouseUpHandler;
@@ -114,6 +122,9 @@ public static class FrameworkElementExtensions
         };
 
         _containers.Add(container);
+        UnregisterWhenUnloaded(container);
+
+        return container.Token;
     }
 
     /// <summary>
@@ -121,9 +132,9 @@ public static class FrameworkElementExtensions
     /// </summary>
     /// <param name="element">The element.</param>
     /// <param name="handler">The handler.</param>
-    public static void RegisterForMouseOrTouchDown(this FrameworkElement element, EventHandler<MouseOrTouchEventArgs> handler)
+    public static String RegisterForMouseOrTouchDown(this FrameworkElement element, EventHandler<MouseOrTouchEventArgs> handler)
     {
-        RegisterForMouseOrTouchDown(element, null, handler);
+        return RegisterForMouseOrTouchDown(element, null, handler);
     }
 
     /// <summary>
@@ -132,7 +143,7 @@ public static class FrameworkElementExtensions
     /// <param name="element">The element.</param>
     /// <param name="relativeTo">The relative to.</param>
     /// <param name="handler">The handler.</param>
-    public static void RegisterForMouseOrTouchUp(this FrameworkElement element, FrameworkElement relativeTo, EventHandler<MouseOrTouchEventArgs> handler)
+    public static String RegisterForMouseOrTouchUp(this FrameworkElement element, FrameworkElement relativeTo, EventHandler<MouseOrTouchEventArgs> handler)
     {
         bool mouseReleased = false;
         bool touchReleased = false;
@@ -202,6 +213,7 @@ public static class FrameworkElementExtensions
 
         ElementEventsContainer container = new ElementEventsContainer();
         container.Handler = handler;
+        container.Element = element;
         container.Clear = () =>
         {
             element.TouchDown -= touchDownHandler;
@@ -210,6 +222,9 @@ public static class FrameworkElementExtensions
         };
 
         _containers.Add(container);
+        UnregisterWhenUnloaded(container);
+
+        return container.Token;
     }
 
     /// <summary>
@@ -217,9 +232,9 @@ public static class FrameworkElementExtensions
     /// </summary>
     /// <param name="element">The element.</param>
     /// <param name="handler">The handler.</param>
-    public static void RegisterForMouseOrTouchUp(this FrameworkElement element, EventHandler<MouseOrTouchEventArgs> handler)
+    public static String RegisterForMouseOrTouchUp(this FrameworkElement element, EventHandler<MouseOrTouchEventArgs> handler)
     {
-        RegisterForMouseOrTouchUp(element, null, handler);
+        return RegisterForMouseOrTouchUp(element, null, handler);
     }
 
     /// <summary>
@@ -228,7 +243,7 @@ public static class FrameworkElementExtensions
     /// <param name="element">The element.</param>
     /// <param name="relativeTo">The relative to.</param>
     /// <param name="handler">The handler.</param>
-    public static void RegisterForPreviewMouseOrTouchDown(this FrameworkElement element, FrameworkElement relativeTo, EventHandler<MouseOrTouchEventArgs> handler)
+    public static String RegisterForPreviewMouseOrTouchDown(this FrameworkElement element, FrameworkElement relativeTo, EventHandler<MouseOrTouchEventArgs> handler)
     {
         bool mousePressed = false;
         bool touchDown = false;
@@ -301,6 +316,7 @@ public static class FrameworkElementExtensions
 
         ElementEventsContainer container = new ElementEventsContainer();
         container.Handler = handler;
+        container.Element = element;
         container.Clear = () =>
         {
             element.PreviewTouchDown -= previewTouchDownHandler;
@@ -309,6 +325,9 @@ public static class FrameworkElementExtensions
         };
 
         _containers.Add(container);
+        UnregisterWhenUnloaded(container);
+
+        return container.Token;
     }
 
     /// <summary>
@@ -316,9 +335,9 @@ public static class FrameworkElementExtensions
     /// </summary>
     /// <param name="element">The element.</param>
     /// <param name="handler">The handler.</param>
-    public static void RegisterForPreviewMouseOrTouchDown(this FrameworkElement element, EventHandler<MouseOrTouchEventArgs> handler)
+    public static String RegisterForPreviewMouseOrTouchDown(this FrameworkElement element, EventHandler<MouseOrTouchEventArgs> handler)
     {
-        RegisterForPreviewMouseOrTouchDown(element, null, handler);
+        return RegisterForPreviewMouseOrTouchDown(element, null, handler);
     }
 
     /// <summary>
@@ -327,7 +346,7 @@ public static class FrameworkElementExtensions
     /// <param name="element">The element.</param>
     /// <param name="relativeTo">The relative to.</param>
     /// <param name="handler">The handler.</param>
-    public static void RegisterForPreviewMouseOrTouchUp(this FrameworkElement element, FrameworkElement relativeTo, EventHandler<MouseOrTouchEventArgs> handler)
+    public static String RegisterForPreviewMouseOrTouchUp(this FrameworkElement element, FrameworkElement relativeTo, EventHandler<MouseOrTouchEventArgs> handler)
     {
         bool mouseReleased = false;
         bool touchReleased = false;
@@ -397,6 +416,7 @@ public static class FrameworkElementExtensions
 
         ElementEventsContainer container = new ElementEventsContainer();
         container.Handler = handler;
+        container.Element = element;
         container.Clear = () =>
         {
             element.PreviewTouchDown -= previewTouchDownHandler;
@@ -405,6 +425,9 @@ public static class FrameworkElementExtensions
         };
 
         _containers.Add(container);
+        UnregisterWhenUnloaded(container);
+
+        return container.Token;
     }
 
     /// <summary>
@@ -412,9 +435,9 @@ public static class FrameworkElementExtensions
     /// </summary>
     /// <param name="element">The element.</param>
     /// <param name="handler">The handler.</param>
-    public static void RegisterForPreviewMouseOrTouchUp(this FrameworkElement element, EventHandler<MouseOrTouchEventArgs> handler)
+    public static String RegisterForPreviewMouseOrTouchUp(this FrameworkElement element, EventHandler<MouseOrTouchEventArgs> handler)
     {
-        RegisterForPreviewMouseOrTouchUp(element, null, handler);
+        return RegisterForPreviewMouseOrTouchUp(element, null, handler);
     }
 
     /// <summary>
@@ -422,9 +445,9 @@ public static class FrameworkElementExtensions
     /// </summary>
     /// <param name="element">The element.</param>
     /// <param name="handler">The handler.</param>
-    public static void UnRegisterMouseOrTouch(this FrameworkElement element, EventHandler<MouseOrTouchEventArgs> handler)
+    public static void UnRegisterMouseOrTouch(this FrameworkElement element)
     {
-        var containers = _containers.Where(x => x.Handler == handler);
+        var containers = _containers.Where(x => x.Element == element).ToList();
 
         foreach (var container in containers.ToList())
         {
@@ -443,7 +466,7 @@ public static class FrameworkElementExtensions
     {
         bool _isTouch = false;
 
-        element.MouseMove += (x, e) =>
+        MouseEventHandler mouseHandler = (x, e) =>
         {
             if (!_isTouch)
             {
@@ -461,7 +484,9 @@ public static class FrameworkElementExtensions
             }
         };
 
-        element.TouchMove += (x, e) =>
+        element.MouseMove += mouseHandler;
+
+        EventHandler<TouchEventArgs> touchHandler = (x, e) =>
         {
             _isTouch = true;
 
@@ -478,6 +503,20 @@ public static class FrameworkElementExtensions
             handler(element, args);
             e.Handled = args.Handled;
         };
+
+        element.TouchMove += touchHandler;
+
+        ElementEventsContainer container = new ElementEventsContainer();
+        container.Handler = handler;
+        container.Element = element;
+        container.Clear = () =>
+        {
+            element.MouseMove -= mouseHandler;
+            element.TouchMove -= touchHandler;
+        };
+
+        _containers.Add(container);
+        UnregisterWhenUnloaded(container);
     }
 
     /// <summary>
@@ -490,6 +529,17 @@ public static class FrameworkElementExtensions
         RegisterForMouseOrTouchMove(element, null, handler);
     }
 
+    private static void UnregisterWhenUnloaded(ElementEventsContainer container)
+    {
+        container.Element.Unloaded += Element_Unloaded;
+    }
+
+    private static void Element_Unloaded(object sender, RoutedEventArgs e)
+    {
+        (sender as FrameworkElement).Unloaded -= Element_Unloaded;
+        UnRegisterMouseOrTouch(sender as FrameworkElement);
+    }
+
     #endregion
 
     #region Loaded
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index 31ab51692..061d97c22 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,76 +5,76 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="6.75" PointY="7.5" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="6.75" PointY="64.875" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="73.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="6.75" PointY="70.625" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="13.75" PointY="28.875" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="9" PointY="42.75" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="24.125" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="52.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="5.25" PointY="28.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="34.75" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="9" PointY="70.5" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="6.75" PointY="11.5" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="6" PointY="16.375" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6.75" PointY="89.375" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="9" PointY="88.75" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="67.75" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="11.25" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="18.75" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="27.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="12.75" PointY="68.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="15" PointY="70.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="93.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="12" PointY="81.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.75" PointY="63.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="12" PointY="76" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.75" PointY="85" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9" PointY="80.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.75" PointY="86.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="15" PointY="75.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="67.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="12" PointY="71.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="76.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="6.75" PointY="81.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="9" PointY="76.875" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="9" PointY="39.375" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="11.25" PointY="43.625" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="10.5" PointY="17.5" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="8.25" PointY="21" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="30.625" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="17.25" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="20.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="8.25" PointY="49.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="9" PointY="12.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="11.25" PointY="21.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="13.5" PointY="24.125" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="24.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="33.5" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="21.75" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="9" PointY="45.625" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="9" PointY="1.875" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="9" PointY="96.5" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="56.875" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="58.5" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="21.375" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="9" PointY="53.5" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="11.25" PointY="53.5" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="10.5" PointY="31.25" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="8.375" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="16.5" PointY="24.125" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="20.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="2.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="4.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="0.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="2.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="0.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="4.75" PointY="3.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="6" PointY="34.5" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="11.25" PointY="35.5" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="6" PointY="39.75" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3.75" PointY="7.875" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="3.75" PointY="42.5" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="39.5" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="3.75" PointY="32.375" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="23.125" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="16.25" PointY="20" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="13.5" PointY="22.875" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="61.125" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="5.25" PointY="24.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="6" PointY="16" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6" PointY="38" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3.75" PointY="4" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="35.5" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="14" PointY="52" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="16.25" PointY="51.375" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="45.375" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="8.25" PointY="29.875" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="32.125" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="23.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="9.75" PointY="54.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="12" PointY="39.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="50.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="12" PointY="35.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="3.75" PointY="48.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6" PointY="42.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.75" PointY="48.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9" PointY="42.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.75" PointY="47.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="15" PointY="35" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="58.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="12" PointY="43.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="35.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="3.75" PointY="18.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6" PointY="33.625" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="16.25" PointY="12.125" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="18.5" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="13.5" PointY="30.5" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="22.5" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="20.375" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="11.25" PointY="13" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="25.875" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="10.5" PointY="8.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6" PointY="20" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="8.25" PointY="17.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="10.5" PointY="17.625" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="26.125" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="35" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="29.125" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="16.25" PointY="16" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="6" PointY="6" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="11.25" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="54.375" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="56" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="22.875" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="11.25" PointY="4.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="13.5" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="27" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="11.875" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="13.5" PointY="18.75" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="2.25" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="13.5" PointY="8.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="0.75" PointY="5.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="5.75" PointY="2.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="7.75" PointY="2.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="0.75" PointY="9.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="2.75" PointY="12.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="15.75" PointY="2.25" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="8.25" PointY="11.75" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="13.5" PointY="12.75" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="38.625" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" />
diff --git a/Software/Visual_Studio/Tango.DragAndDrop/DragAndDropService.cs b/Software/Visual_Studio/Tango.DragAndDrop/DragAndDropService.cs
index 8833feff8..1c84b8768 100644
--- a/Software/Visual_Studio/Tango.DragAndDrop/DragAndDropService.cs
+++ b/Software/Visual_Studio/Tango.DragAndDrop/DragAndDropService.cs
@@ -597,6 +597,31 @@ namespace Tango.DragAndDrop
         }
 
         /// <summary>
+        /// Handles the Unloaded event of the Element control.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="RoutedEventArgs"/> instance containing the event data.</param>
+        private static void Element_Unloaded(object sender, RoutedEventArgs e)
+        {
+            FrameworkElement element = sender as FrameworkElement;
+            UnRegisterDraggable(element);
+            element.PreviewMouseUp -= Draggable_PreviewMouseUp;
+            element.Unloaded -= Element_Unloaded;
+        }
+
+        /// <summary>
+        /// Handles the Unloaded1 event of the Element control.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="RoutedEventArgs"/> instance containing the event data.</param>
+        private static void Element_Unloaded1(object sender, RoutedEventArgs e)
+        {
+            FrameworkElement element = sender as FrameworkElement;
+            UnRegisterDroppable(element);
+            element.Unloaded -= Element_Unloaded1;
+        }
+
+        /// <summary>
         /// Registers a framework element as a droppable element.
         /// </summary>
         /// <param name="element">The element.</param>
@@ -814,32 +839,6 @@ namespace Tango.DragAndDrop
             }
         }
 
-        /// <summary>
-        /// Handles the Unloaded event of the Element control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="RoutedEventArgs"/> instance containing the event data.</param>
-        private static void Element_Unloaded(object sender, RoutedEventArgs e)
-        {
-            //FrameworkElement element = sender as FrameworkElement;
-            //UnRegisterDraggable(element);
-        }
-
-        #endregion
-
-        #region Droppable Event Handlers
-
-        /// <summary>
-        /// Handles the Unloaded1 event of the Element control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="RoutedEventArgs"/> instance containing the event data.</param>
-        private static void Element_Unloaded1(object sender, RoutedEventArgs e)
-        {
-            //FrameworkElement element = sender as FrameworkElement;
-            //UnRegisterDroppable(element);
-        }
-
         #endregion
     }
 }
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/LightTouchDataGrid.cs b/Software/Visual_Studio/Tango.Touch/Controls/LightTouchDataGrid.cs
index 552543320..5fe5b7d62 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/LightTouchDataGrid.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/LightTouchDataGrid.cs
@@ -559,9 +559,7 @@ namespace Tango.Touch.Controls
 
                 if (row != null)
                 {
-                    row.UnRegisterMouseOrTouch(OnRowMouseTouchUp);
                     row.RegisterForPreviewMouseOrTouchUp(OnRowMouseTouchUp);
-                    row.UnRegisterMouseOrTouch(OnRowMouseTouchDown);
                     row.RegisterForPreviewMouseOrTouchDown(OnRowMouseTouchDown);
                 }
             }
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index c83bdd628..880ff9c4a 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -184,8 +184,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{0048
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Jobs", "PPC\Modules\Tango.PPC.Jobs\Tango.PPC.Jobs.csproj", "{096F16C8-6D06-4B5F-9496-B9D2DF2D94A3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Synchronization", "PPC\Modules\Tango.PPC.Synchronization\Tango.PPC.Synchronization.csproj", "{729455D4-C384-4497-AF5D-0A598F86DAC6}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.HashGenerator", "Utilities\Tango.HashGenerator\Tango.HashGenerator.csproj", "{0440A135-0DF0-4232-AB3C-98B9283123B3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Hive", "Tango.Hive\Tango.Hive.csproj", "{942134AC-6EA2-4500-8F22-0F739B70A05F}"
@@ -236,8 +234,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Firmware", "Firmware", "{AD
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tango.FirmwareUpdateLib", "Firmware\Tango.FirmwareUpdateLib\Tango.FirmwareUpdateLib.vcxproj", "{DB79FB33-CE7A-49CF-AA89-F697E5CDB0F6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Power", "PPC\Modules\Tango.PPC.Power\Tango.PPC.Power.csproj", "{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.WatchDog", "PPC\Tango.PPC.WatchDog\Tango.PPC.WatchDog.csproj", "{280267F5-A19E-4B96-999D-C13D293ECA45}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.FirmwareUpdateLib.WPF", "Firmware\Tango.FirmwareUpdateLib.WPF\Tango.FirmwareUpdateLib.WPF.csproj", "{25D7CC4D-A11C-4065-A797-4A1944F636C0}"
@@ -3244,46 +3240,6 @@ Global
 		{096F16C8-6D06-4B5F-9496-B9D2DF2D94A3}.Release|x64.Build.0 = Release|Any CPU
 		{096F16C8-6D06-4B5F-9496-B9D2DF2D94A3}.Release|x86.ActiveCfg = Release|Any CPU
 		{096F16C8-6D06-4B5F-9496-B9D2DF2D94A3}.Release|x86.Build.0 = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.AppVeyor|Any CPU.Build.0 = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.AppVeyor|ARM.ActiveCfg = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.AppVeyor|ARM.Build.0 = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.AppVeyor|ARM64.ActiveCfg = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.AppVeyor|ARM64.Build.0 = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.AppVeyor|x64.ActiveCfg = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.AppVeyor|x64.Build.0 = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.AppVeyor|x86.ActiveCfg = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.AppVeyor|x86.Build.0 = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Debug|ARM.Build.0 = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Debug|x64.Build.0 = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Debug|x86.Build.0 = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.DefaultBuild|ARM.ActiveCfg = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.DefaultBuild|ARM.Build.0 = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.DefaultBuild|ARM64.ActiveCfg = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.DefaultBuild|ARM64.Build.0 = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.DefaultBuild|x64.ActiveCfg = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.DefaultBuild|x64.Build.0 = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.DefaultBuild|x86.ActiveCfg = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.DefaultBuild|x86.Build.0 = Debug|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Release|ARM.ActiveCfg = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Release|ARM.Build.0 = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Release|ARM64.Build.0 = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Release|x64.ActiveCfg = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Release|x64.Build.0 = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Release|x86.ActiveCfg = Release|Any CPU
-		{729455D4-C384-4497-AF5D-0A598F86DAC6}.Release|x86.Build.0 = Release|Any CPU
 		{0440A135-0DF0-4232-AB3C-98B9283123B3}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU
 		{0440A135-0DF0-4232-AB3C-98B9283123B3}.AppVeyor|Any CPU.Build.0 = Release|Any CPU
 		{0440A135-0DF0-4232-AB3C-98B9283123B3}.AppVeyor|ARM.ActiveCfg = Release|Any CPU
@@ -4235,46 +4191,6 @@ Global
 		{DB79FB33-CE7A-49CF-AA89-F697E5CDB0F6}.Release|x64.Build.0 = Release|x64
 		{DB79FB33-CE7A-49CF-AA89-F697E5CDB0F6}.Release|x86.ActiveCfg = Release|Win32
 		{DB79FB33-CE7A-49CF-AA89-F697E5CDB0F6}.Release|x86.Build.0 = Release|Win32
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|Any CPU.Build.0 = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|ARM.ActiveCfg = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|ARM.Build.0 = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|ARM64.ActiveCfg = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|ARM64.Build.0 = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|x64.ActiveCfg = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|x64.Build.0 = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|x86.ActiveCfg = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.AppVeyor|x86.Build.0 = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|ARM.Build.0 = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|x64.Build.0 = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Debug|x86.Build.0 = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|ARM.ActiveCfg = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|ARM.Build.0 = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|ARM64.ActiveCfg = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|ARM64.Build.0 = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|x64.ActiveCfg = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|x64.Build.0 = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|x86.ActiveCfg = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.DefaultBuild|x86.Build.0 = Debug|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|ARM.ActiveCfg = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|ARM.Build.0 = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|ARM64.Build.0 = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|x64.ActiveCfg = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|x64.Build.0 = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|x86.ActiveCfg = Release|Any CPU
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0}.Release|x86.Build.0 = Release|Any CPU
 		{280267F5-A19E-4B96-999D-C13D293ECA45}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU
 		{280267F5-A19E-4B96-999D-C13D293ECA45}.AppVeyor|Any CPU.Build.0 = Release|Any CPU
 		{280267F5-A19E-4B96-999D-C13D293ECA45}.AppVeyor|ARM.ActiveCfg = Release|Any CPU
@@ -5338,7 +5254,6 @@ Global
 		{4FD16878-1A44-4CCE-9589-5FC630FACDE9} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760}
 		{0048447D-1D94-4E60-9DAD-7349C777CB4E} = {C81ED1A3-D18C-4D80-A8F5-061994A14A60}
 		{096F16C8-6D06-4B5F-9496-B9D2DF2D94A3} = {0048447D-1D94-4E60-9DAD-7349C777CB4E}
-		{729455D4-C384-4497-AF5D-0A598F86DAC6} = {0048447D-1D94-4E60-9DAD-7349C777CB4E}
 		{0440A135-0DF0-4232-AB3C-98B9283123B3} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760}
 		{808E47B6-BAA7-4D23-83CB-40C53DC4B38A} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760}
 		{91B70E9B-66A7-4873-AE10-400E71CF404F} = {0048447D-1D94-4E60-9DAD-7349C777CB4E}
@@ -5355,7 +5270,6 @@ Global
 		{7E5E4BED-538C-4566-A005-DCC070AF8715} = {C81ED1A3-D18C-4D80-A8F5-061994A14A60}
 		{F69DA3A8-F823-461E-87CF-A9275ABC0B15} = {B2AF4F3F-2828-47C3-8F3E-A0EA0BD66FF8}
 		{DB79FB33-CE7A-49CF-AA89-F697E5CDB0F6} = {AD8721D6-D728-4D58-A0D8-BE2E3FF7A9BC}
-		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0} = {0048447D-1D94-4E60-9DAD-7349C777CB4E}
 		{280267F5-A19E-4B96-999D-C13D293ECA45} = {C81ED1A3-D18C-4D80-A8F5-061994A14A60}
 		{25D7CC4D-A11C-4065-A797-4A1944F636C0} = {AD8721D6-D728-4D58-A0D8-BE2E3FF7A9BC}
 		{6F924F92-611B-41CF-A6E6-443E69D4CA83} = {57DF2A95-5DDD-4830-A4AF-B484B59C7C2B}
@@ -5382,12 +5296,12 @@ Global
 		{B822CBD9-1113-4668-85C9-22AA9C24CE60} = {EC62BC9C-F2FE-4333-B7E4-110E38D43958}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
-		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
-		BuildVersion_UpdateAssemblyVersion = True
-		BuildVersion_UpdateFileVersion = False
-		BuildVersion_StartDate = 2000/1/1
-		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
 		BuildVersion_UseGlobalSettings = False
+		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
+		BuildVersion_StartDate = 2000/1/1
+		BuildVersion_UpdateFileVersion = False
+		BuildVersion_UpdateAssemblyVersion = True
+		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
+		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
 	EndGlobalSection
 EndGlobal