Shipment Forms

DONE besides checking format of input
Merge branch 'master' of https://github.com/cjsolomon/Mulit-Modal

Conflicts:
	MMRP/src/GUI/ShipmentForms/ShipmentForm.java
Merge branch 'master' of https://github.com/cjsolomon/Mulit-Modal