Merge branch 'codyChanges' into delroyChanges

Conflicts:
	src/cmmsObjects/Vehicle.java
	src/cmmsPresentation/AddPart.java
	src/cmmsPresentation/AddVehicle.java
	src/cmmsPresentation/EditPartsList.java
Merge branch 'delroyChanges'

Conflicts:
	src/cmmsObjects/Vehicle.java
	src/cmmsPresentation/AddVehicle.java
	src/cmmsPresentation/EditPartsList.java