da
Merge branch 'master' of https://github.com/utwente-di/di02

Conflicts:
	werkende versie
workspace/flatportal-final/target/classes/connectie/Database.class
	werkende versie workspace/flatportal-final/target/flatportal-final.war
	werkende versie
workspace/flatportal-final/target/flatportal-final/WEB-INF/classes/conne
ctie/Database.class
	werkende versie
workspace/flatportal-final/target/m2e-wtp/web-resources/META-INF/maven/n
l.utwente.di/flatportal-final/pom.properties
	werkende versie
workspace/flatportal-final/target/maven-archiver/pom.properties
Merge branch 'master' of https://github.com/utwente-di/di02