fixed a couple of bugs
Merge origin/development into development

Conflicts:
	src/convoy/gui/VehiclePanel.form
	src/convoy/gui/VehiclePanel.java