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

Conflicts:
	Displays/SamplePlanEditor/MainForm.xaml.cs
	Displays/SampleTypeEditor/obj/Debug/MainForm.g.i.cs
sample plan