Popup removed
Merge branch 'master' of https://github.com/tbedi/ShipmentComptroller

Conflicts:
	ShippingController(V1.0)/ShippingController(V1.0).v11.suo
	ShippingController(V1.0)/ShippingController(V1.0)/bin/ShippingController(V1.0).dll
	ShippingController(V1.0)/ShippingController(V1.0)/bin/ShippingController(V1.0).pdb
	ShippingController(V1.0)/ShippingController(V1.0)/obj/Debug/ShippingController(V1.0).dll
	ShippingController(V1.0)/ShippingController(V1.0)/obj/Debug/ShippingController(V1.0).pdb