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

Conflicts:
	werkende versie
workspace/flatportal-final/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	werkende versie
workspace/flatportal-final/target/m2e-wtp/web-resources/META-INF/maven/nl.utwente.di/flatportal-final/pom.properties
Merge branch 'master' of https://github.com/utwente-di/di02

Conflicts:
	werkende versie
workspace/flatportal-final/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	werkende versie
workspace/flatportal-final/target/m2e-wtp/web-resources/META-INF/maven/nl.utwente.di/flatportal-final/pom.properties