Changes as of 12/15/14
Merge remote-tracking branch 'origin/master'

Conflicts:
	ISIInspection/SPC Data Collection/MainWindow.xaml
	ISIInspection/SPC Data Collection/MainWindow.xaml.cs
	ISIInspection/SPC Data Collection/SPC Data Collection.csproj
	ISIInspection/SPC Data Collection/bin/Debug/ISIInspection.dll
	ISIInspection/SPC Data Collection/bin/Debug/ISIInspection.pdb
stan changes
removed files
Merge remote-tracking branch 'origin/master'

Conflicts:
	ISIInspection/MieTrakWrapper/bin/Debug/MieTrakWrapper.dll
	ISIInspection/MieTrakWrapper/bin/Debug/MieTrakWrapper.pdb
	ISIInspection/MieTrakWrapper/obj/Debug/MieTrakWrapper.dll
	ISIInspection/MieTrakWrapper/obj/Debug/MieTrakWrapper.pdb
	ISIInspection/SPC Data Collection/bin/Debug/MieTrakWrapper.dll
	ISIInspection/SPC Data Collection/bin/Debug/MieTrakWrapper.pdb
	ISIInspection/SPC Data Collection/obj/Debug/LogonWindow.baml
	ISIInspection/SPC Data Collection/obj/Debug/SPC Data Collection.g.resources