HL-31
Merge branch 'master' of github.com:HogeschoolLeiden/website

Conflicts:
	bootstrap/configuration/src/main/resources/hst/configurations/common/templates.xml