password uit txt halen kusjes mij
vage shit
Merge branch 'master' of https://github.com/utwente-di/di09

Conflicts:
	design/JavaProject/Concordia/src/main/webapp/admin/addKunstwerk.jsp
	design/JavaProject/Concordia/src/main/webapp/kunst_catalogus.jsp
	design/JavaProject/Concordia/target/m2e-wtp/web-resources/META-INF/maven/nl.utwente.di/Concordia/pom.properties
Merge branch 'master' of https://github.com/utwente-di/di09