Merge origin/master

Conflicts:
	src/ControlObjects/Reservation.java
Merge origin/master
Merge origin/master

Conflicts:
	src/ControlObjects/Reservation.java
Reservation and VehicleClass Functionality implemented.