More Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	ISIInspection/ISIInspection.v12.suo
	ISIInspection/SPC Data Collection/CreatePlan.xaml
	ISIInspection/SPC Data Collection/CreatePlan.xaml.cs
	ISIInspection/SPC Data Collection/bin/Debug/SPC Data Collection.exe
	ISIInspection/SPC Data Collection/bin/Debug/SPC Data Collection.pdb
	ISIInspection/SPC Data Collection/obj/Debug/CreatePlan.g.cs
	ISIInspection/SPC Data Collection/obj/Debug/CreatePlan.g.i.cs
	ISIInspection/SPC Data Collection/obj/Debug/SPC Data Collection.exe
	ISIInspection/SPC Data Collection/obj/Debug/SPC Data Collection.pdb
Updates to the IP UI
Merge remote-tracking branch 'origin/master'

Conflicts:
	ISIInspection/SPC Data Collection/CreatePlan.xaml
	ISIInspection/SPC Data Collection/MainWindow.xaml.cs