bla
Merge branch 'admin'

Conflicts:
	website/src/main/java/concordia/kunstverhuur/StandardPage.java