Git being weird
Database server now uses auto_increment primary keys.  See SQL files
Merge branch 'master' into VehicleNewDelete

Conflicts:
	overwatch/src/overwatch/controllers/VehicleLogic.java
Vehicles: create updated to use autoIncrement instead of locks