omnikassa phase 2.
Merge branch 'master' of github.com:HogeschoolLeiden/website

Conflicts:
	bootstrap/configuration/src/main/resources/configuration/modules/broadcast.xml
	bootstrap/configuration/src/main/resources/hippoecm-extension.xml
	bootstrap/configuration/src/main/resources/hst/configurations/common/templates.xml
	bootstrap/configuration/src/main/resources/hst/configurations/hsl/sitemap.xml
	bootstrap/content/src/main/resources/content/documents/hsl/configuratie.xml