Merge master into version-DreamTeam

Conflicts:
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/controller/BungalowController.java