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

Conflicts:
	Displays/SampleTypeEditor/MainForm.xaml
add new feature
add new feature
Merge branch 'origin/master'

Conflicts:
	Displays/SamplePlanEditor/Data/SamplePlanTriggerData.cs
	Displays/SamplePlanEditor/ViewModel/EventDelayMinutesViewModel.cs
	Displays/SampleTypeEditor/MainForm.xaml.cs
	Displays/SampleTypeEditor/Model/Optionality.cs
	Displays/TestEditor/MainForm.xaml
	Displays/TestEditor/MainForm.xaml.cs
	Displays/TestEditor/ProficyConstants.cs
	Displays/TestEditor/TestEditor.csproj
	Displays/TestGroupEditorDisplay/MainForm.xaml
	Displays/TestGroupEditorDisplay/MainForm.xaml.cs
	Displays/TestGroupEditorDisplay/Model/TestGroupTests.cs
	Displays/TestGroupEditorDisplay/TestGroupEditorDisplay.csproj
	Displays/TestGroupEditorDisplay/TestGroupEditorDisplay.csproj.user
	Displays/TestGroupEditorDisplay/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Displays/TestGroupEditorDisplay/obj/Debug/MainForm.g.cs
	Displays/TestGroupEditorDisplay/obj/Debug/MainForm.g.i.cs
	Displays/TestGroupEditorDisplay/obj/Debug/TestGroupEditorDisplay.csproj.FileListAbsolute.txt
	Displays/TestGroupEditorDisplay/obj/Debug/TestGroupEditorDisplay.csprojResolveAssemblyReference.cache
	Displays/TestGroupEditorDisplay/obj/Debug/TestGroupEditorDisplay_MarkupCompile.cache
	Displays/TestGroupEditorDisplay/obj/Debug/TestGroupEditorDisplay_MarkupCompile.i.cache