Merge origin/master

Conflicts:
	src/domain/Booking.java