Merge master into version-DreamTeam

Conflicts:
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/controller/BungalowController.java
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/dao/BungalowDao.java
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/dao/ParkDao.java
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/entity/BungalowEntity.java
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/model/BungalowListDetailDto.java
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/sample/ui/controller/SampleBungalowController.java
	ResortUI/src/main/webapp/bungalow.xhtml
	ResortUI/src/main/webapp/park.xhtml
	ResortUI/src/main/webapp/profile.xhtml