merge conflicts

23 files changed, 72 insertions, 71 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs
index 205323af0..bda64c925 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Color Lab Module")]
-[assembly: AssemblyVersion("2.0.7.1657")]
+[assembly: AssemblyVersion("2.0.8.1633")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs
index 404c1519f..3b589e28b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio DB Module")]
-[assembly: AssemblyVersion("2.0.6.1407")]
+[assembly: AssemblyVersion("2.0.7.1633")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs
index 68ae9f9bc..51246a5d1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Data Capturing Module")]
-[assembly: AssemblyVersion("2.0.7.1304")]
+[assembly: AssemblyVersion("2.0.8.1633")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs
index 104fe419e..66e36649b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Developer Module")]
-[assembly: AssemblyVersion("2.0.12.1347")]
+[assembly: AssemblyVersion("2.0.15.1633")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 1edbce641..f54de0814 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -729,7 +729,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 if (IsVisible && ActiveJob != null && ActiveJob.Segments != null)
                 {
-                    var stops = ActiveJob.Segments.SelectMany(x => x.BrushStops);
+                    var stops = ActiveJob.Segments.SelectMany(x => x.BrushStops).ToList();
 
                     foreach (var stop in stops)
                     {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 6d10e910e..1b96b27ce 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -753,7 +753,11 @@
 
                                                                                                                         <TextBlock VerticalAlignment="Center" Margin="40 0 0 0" FontSize="16" FontStyle="Italic" Foreground="Gray">
                                                                                                                             <Run>Total:</Run>
-                                                                                                                            <Run Text="{Binding LiquidVolumesSum,Mode=OneWay,StringFormat=0}"></Run>
+                                                                                                                            <Run Text="{Binding TotalLiquidVolume,Mode=OneWay,StringFormat=0}"></Run><Run>%</Run>
+                                                                                                                            <Run>(</Run>
+                                                                                                                            <Run FontSize="10" Text="{Binding TotalLiquidNanoliterPerCentimeter,Mode=OneWay,StringFormat=0.00}"></Run>
+                                                                                                                            <Run FontSize="12">nl</Run>
+                                                                                                                            <Run>)</Run>
                                                                                                                         </TextBlock>
                                                                                                                     </StackPanel>
                                                                                                                 </Setter.Value>
@@ -1000,7 +1004,7 @@
                                                                                                                             <DataGridTemplateColumn.CellTemplate>
                                                                                                                                 <DataTemplate>
                                                                                                                                     <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding IdsPack.DispenserType.NlPerPulse,StringFormat='0.0'}"></Run>
+                                                                                                                        <Run Text="{Binding IdsPack.DispenserType.NlPerPulse,StringFormat='0.00'}"></Run>
                                                                                                                         <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
                                                                                                                                     </TextBlock>
                                                                                                                                 </DataTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs
index f6d950a60..54e27ec27 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Hardware Designer Module")]
-[assembly: AssemblyVersion("2.0.7.1034")]
+[assembly: AssemblyVersion("2.0.8.1633")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
index e02b63000..8f69fb919 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Logging Module")]
-[assembly: AssemblyVersion("2.0.12.1034")]
+[assembly: AssemblyVersion("2.0.15.1633")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs
index c930f533e..832feca43 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Machine Designer Module")]
-[assembly: AssemblyVersion("2.0.7.1034")]
+[assembly: AssemblyVersion("2.0.8.1633")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs
index 77fb1b687..bf0680366 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Stubs Module")]
-[assembly: AssemblyVersion("2.0.6.1407")]
+[assembly: AssemblyVersion("2.0.7.1633")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs
index 884170a37..44e1dba95 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Synchronization Module")]
-[assembly: AssemblyVersion("2.0.8.1034")]
+[assembly: AssemblyVersion("2.0.9.1633")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
index f1ead0cad..81ddfd184 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
@@ -241,7 +241,7 @@
         <!--Content-->
         <Grid>
             <Border Margin="0 0 0 -23" VerticalAlignment="Bottom">
-                <TextBlock Text="{Binding TechDispenser.Description}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock Text="{Binding DisplayName}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml.cs
index ca686d3e2..037e29b57 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml.cs
@@ -117,24 +117,28 @@ namespace Tango.MachineStudio.Technician.Editors
 
         private void OnForwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             DispenserItem.RaiseAction(MotorActionType.ForwardPressed);
             AnimateRight();
         }
 
         private void OnForwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             DispenserItem.RaiseAction(MotorActionType.ForwardReleased);
             StopAnimation();
         }
 
         private void OnBackwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             DispenserItem.RaiseAction(MotorActionType.BackwardPressed);
             AnimateLeft();
         }
 
         private void OnBackwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             DispenserItem.RaiseAction(MotorActionType.BackwardReleased);
             StopAnimation();
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml.cs
index da65b9ab4..625473521 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml.cs
@@ -117,24 +117,28 @@ namespace Tango.MachineStudio.Technician.Editors
 
         private void OnForwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             MotorItem.RaiseAction(MotorActionType.ForwardPressed);
             AnimateRight();
         }
 
         private void OnForwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             MotorItem.RaiseAction(MotorActionType.ForwardReleased);
             StopAnimation();
         }
 
         private void OnBackwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             MotorItem.RaiseAction(MotorActionType.BackwardPressed);
             AnimateLeft();
         }
 
         private void OnBackwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             MotorItem.RaiseAction(MotorActionType.BackwardReleased);
             StopAnimation();
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml.cs
index eaee03c2b..5d9954605 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml.cs
@@ -118,24 +118,28 @@ namespace Tango.MachineStudio.Technician.Editors
 
         private void OnForwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             MotorGroupItem.RaiseAction(MotorActionType.ForwardPressed);
             AnimateRight();
         }
 
         private void OnForwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             MotorGroupItem.RaiseAction(MotorActionType.ForwardReleased);
             StopAnimation();
         }
 
         private void OnBackwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             MotorGroupItem.RaiseAction(MotorActionType.BackwardPressed);
             AnimateLeft();
         }
 
         private void OnBackwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             MotorGroupItem.RaiseAction(MotorActionType.BackwardReleased);
             StopAnimation();
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml.cs
index f5565a796..6de37f3a2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml.cs
@@ -105,24 +105,28 @@ namespace Tango.MachineStudio.Technician.Editors
 
         private void OnForwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             ThreadMotionItem.RaiseAction(MotorActionType.ForwardPressed);
             AnimateRight();
         }
 
         private void OnForwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             ThreadMotionItem.RaiseAction(MotorActionType.ForwardReleased);
             StopAnimation();
         }
 
         private void OnBackwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             ThreadMotionItem.RaiseAction(MotorActionType.BackwardPressed);
             AnimateLeft();
         }
 
         private void OnBackwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             ThreadMotionItem.RaiseAction(MotorActionType.BackwardReleased);
             StopAnimation();
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs
index d6acd3873..e9471fa74 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/MultiTechRecordingData.cs
@@ -30,21 +30,24 @@ namespace Tango.MachineStudio.Technician.Models
 
             Task.Factory.StartNew(() =>
             {
-                var width = data.Count;
-                var height = data.First().Count;
-
-                for (int row = 0; row < height; row++)
+                if (_initialized)
                 {
-                    String time = (delta_base.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * row))).ToString(@"hh\:mm\:ss\.fff");
-
-                    List<double> row_values = new List<double>();
+                    var width = data.Count;
+                    var height = data.First().Count;
 
-                    for (int column = 0; column < width; column++)
+                    for (int row = 0; row < height; row++)
                     {
-                        row_values.Add(data[column][row]);
-                    }
+                        String time = (delta_base.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * row))).ToString(@"hh\:mm\:ss\.fff");
 
-                    CsvFile.Append(new MultiTechRecordingValue(time, row_values));
+                        List<double> row_values = new List<double>();
+
+                        for (int column = 0; column < width; column++)
+                        {
+                            row_values.Add(data[column][row]);
+                        }
+
+                        CsvFile.Append(new MultiTechRecordingValue(time, row_values));
+                    }
                 }
             });
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs
index 3c5426ed9..7aa9a2b3f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/SingleTechRecordingData.cs
@@ -23,9 +23,12 @@ namespace Tango.MachineStudio.Technician.Models
 
             Task.Factory.StartNew(() =>
             {
-                for (int i = 0; i < data.Count; i++)
+                if (_initialized)
                 {
-                    CsvFile.Append(new SingleTechRecordingValue((delta_base.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * i))).ToString(@"hh\:mm\:ss\.fff"), data[i]));
+                    for (int i = 0; i < data.Count; i++)
+                    {
+                        CsvFile.Append(new SingleTechRecordingValue((delta_base.Add(TimeSpan.FromMilliseconds((delta_mili / data.Count) * i))).ToString(@"hh\:mm\:ss\.fff"), data[i]));
+                    }
                 }
             });
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/TechRecordingData.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/TechRecordingData.cs
index cb4b10db1..8024a1375 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/TechRecordingData.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Models/TechRecordingData.cs
@@ -13,6 +13,8 @@ namespace Tango.MachineStudio.Technician.Models
 {
     public abstract class TechRecordingData<T, TValue> : ExtendedObject, IDisposable where T : TechItem where TValue : TechRecordingValue
     {
+        protected bool _initialized;
+
         protected DateTime _last_time;
         protected DateTime _start_time;
 
@@ -36,6 +38,7 @@ namespace Tango.MachineStudio.Technician.Models
             definition.Columns = new List<String>() { "Time" }.Concat(GetColumnNames());
 
             CsvFile = new CsvFile<TValue>(new CsvDestination(TemporaryFile), definition);
+            _initialized = true;
         }
 
         public void Save(String fileName)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
index 0a28fdd26..18f0bd7c0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Technician Module")]
-[assembly: AssemblyVersion("2.0.10.1347")]
+[assembly: AssemblyVersion("2.0.12.1633")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/DispenserTemplate.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/DispenserTemplate.xaml
index df9ebbd4e..d9c0a23e9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/DispenserTemplate.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/DispenserTemplate.xaml
@@ -30,50 +30,10 @@
                 <StackPanel>
                     <TextBlock FontSize="10">Selected Dispenser</TextBlock>
                     <ComboBox Margin="0 5 0 0" ItemsSource="{Binding Adapter.TechDispensers}" SelectedItem="{Binding TechDispenser,Mode=TwoWay}" DisplayMemberPath="Description" />
-                </StackPanel>
-            </GroupBox>
 
-            <GroupBox Header="PARAMETERS" Margin="0 10 0 0">
-                <editors:ParameterizedEditor ParameterizedObject="{Binding DispenserType}" Padding="10">
-                    <editors:ParameterizedEditor.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <StackPanel></StackPanel>
-                        </ItemsPanelTemplate>
-                    </editors:ParameterizedEditor.ItemsPanel>
-                    <editors:ParameterizedEditor.DoubleTemplate>
-                        <DataTemplate>
-                            <DockPanel>
-                                <mahApps:NumericUpDown  DockPanel.Dock="Right" Background="Transparent" BorderThickness="0 0 0 0" Value="{Binding Value,UpdateSourceTrigger=PropertyChanged}" HasDecimals="True" HorizontalContentAlignment="Center" Width="100" />
-                                <TextBlock Text="{Binding Name}" VerticalAlignment="Center"></TextBlock>
-                            </DockPanel>
-                        </DataTemplate>
-                    </editors:ParameterizedEditor.DoubleTemplate>
-                    <editors:ParameterizedEditor.Int32Template>
-                        <DataTemplate>
-                            <DockPanel>
-                                <DockPanel.Style>
-                                    <Style TargetType="DockPanel">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Name}" Value="Code">
-                                                <Setter Property="Visibility" Value="Collapsed"></Setter>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </DockPanel.Style>
-                                <mahApps:NumericUpDown  DockPanel.Dock="Right" Background="Transparent" BorderThickness="0 0 0 0" Value="{Binding Value,Converter={StaticResource DoubleToIntConverter},UpdateSourceTrigger=PropertyChanged}" HasDecimals="False" HorizontalContentAlignment="Center" Width="100" />
-                                <TextBlock Text="{Binding Name}" VerticalAlignment="Center"></TextBlock>
-                            </DockPanel>
-                        </DataTemplate>
-                    </editors:ParameterizedEditor.Int32Template>
-                    <editors:ParameterizedEditor.BooleanTemplate>
-                        <DataTemplate>
-                            <DockPanel Margin="0 5 0 0">
-                                <ToggleButton DockPanel.Dock="Right"  Width="100" IsChecked="{Binding Value}" HorizontalAlignment="Right" />
-                                <TextBlock Text="{Binding Name}" VerticalAlignment="Center"></TextBlock>
-                            </DockPanel>
-                        </DataTemplate>
-                    </editors:ParameterizedEditor.BooleanTemplate>
-                </editors:ParameterizedEditor>
+                    <TextBlock FontSize="10" Margin="0 30 0 0">Display Name</TextBlock>
+                    <TextBox Margin="0 5 0 0" Text="{Binding DisplayName,UpdateSourceTrigger=PropertyChanged}" />
+                </StackPanel>
             </GroupBox>
 
             <GroupBox Header="COLOR" Margin="0 10 0 0">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs
index 573e497d5..5acb2e7e5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs
@@ -63,6 +63,7 @@ namespace Tango.MachineStudio.Technician.TechItems
                 if (_techDispenser != null)
                 {
                     DispenserType = DispenserTypes.SingleOrDefault(x => x.Code == int.Parse(_techDispenser.Name.Replace("Dispenser", "")) - 1);
+                    DisplayName = _techDispenser.Description;
                 }
             }
         }
@@ -149,6 +150,16 @@ namespace Tango.MachineStudio.Technician.TechItems
             set { _speed = value; RaisePropertyChangedAuto(); }
         }
 
+        private String _displayName;
+        /// <summary>
+        /// Gets or sets the display name.
+        /// </summary>
+        public String DisplayName
+        {
+            get { return _displayName; }
+            set { _displayName = value; RaisePropertyChangedAuto(); }
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="DispenserItem"/> class.
         /// </summary>
@@ -178,6 +189,7 @@ namespace Tango.MachineStudio.Technician.TechItems
         {
             DispenserItem cloned = base.Clone() as DispenserItem;
             cloned.TechDispenser = TechDispenser;
+            cloned.DisplayName = DisplayName;
             return cloned;
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
index 10a43ead9..45b3ef1ce 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Users & Roles Module")]
-[assembly: AssemblyVersion("2.0.6.1407")]
+[assembly: AssemblyVersion("2.0.7.1633")]
 
 [assembly: ComVisible(false)]