Merge remote-tracking branch 'origin/master'

Conflicts:
	werkende versie workspace/flatportal-final/target/flatportal-final.war
	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
	werkende versie
workspace/flatportal-final/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst