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 NEWSP-82-publiceren-standaard-artikel into feature/NEWSP-237

Conflicts:
	frontend/app/scripts/constants.js
Einde les 27/11