Merge origin/master

Conflicts:
	ResortUI/src/main/webapp/common/template.xhtml
Merge master into version-DreamTeam
Merge origin/master into version-DreamTeam

Conflicts:
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/controller/BungalowController.java
Added DB-suport
Database impl
Merge origin/master into version-dancing-for-code-pl0x