latest update
Merge branch 'master' of https://github.com/pallin08/MCMS

Conflicts:
	Displays/SamplePlanEditor/bin/Debug/SamplePlanEditor.dll
	Displays/SampleTypeEditor/MainForm.xaml.cs
	Displays/SampleTypeEditor/Model/Optionality.cs
	Displays/TestGroupEditorDisplay/B2TValueConverter.cs
	Displays/TestGroupEditorDisplay/obj/Debug/TestGroupEditorDisplay.csproj.FileListAbsolute.txt