Location Form
Merge branch 'master' of https://github.com/cjsolomon/Mulit-Modal

Conflicts:
	MMRP/MMRP.log.1
	MMRP/src/GUI/VehicleTruckForm.java