project push
Merge branch 'gallerij-gui' of https://github.com/utwente-di/di16 into gallerij-gui

Conflicts:
	kunstverhuur/pom.xml
Merge branch 'gallerij-gui' of https://github.com/utwente-di/di16 into gallerij-gui

Conflicts:
	kunstverhuur/src/main/webapp/navbar.jsp