MC & TC changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	controller/ReservationController.java