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

Conflicts:
	Displays/SamplePlanEditor/Data/SamplePlanTriggerData.cs