Modified Web config
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Web.config
CATS-812 Modified ShippingInstruction Service to not save sinumber if it exists
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Areas/EarlyWarning/Controllers/RequestController.cs
	Web/Web.config