Edit Shipment Prototype (Again)
Merge remote-tracking branch 'origin/master'

Conflicts:
	obj/Debug/SCMS.csproj.FileListAbsolute.txt
	obj/Debug/SCMS.csproj.GenerateResource.Cache