Merge NEWSP-82-publiceren-standaard-artikel into feature/NEWSP-237

Conflicts:
	frontend/app/scripts/constants.js
db fix
Merge origin/version-TeamKoekjes into version-TeamKoekjes

Conflicts:
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/controller/BungalowController.java
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/entity/BungalowDao.java
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/entity/BungalowEntity.java
	ResortUI/src/main/webapp/bungalows.xhtml
	ResortUI/src/main/webapp/common/template.xhtml
Merge origin/version-TeamKoekjes into version-TeamKoekjes

Conflicts:
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/controller/BungalowController.java
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/entity/BungalowDao.java
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/entity/BungalowEntity.java
	ResortUI/src/main/webapp/bungalows.xhtml
	ResortUI/src/main/webapp/common/template.xhtml