meh
Merge remote-tracking branch 'origin/master'

Conflicts:
	werkende versie
workspace/flatportal-final/src/main/webapp/editMutatie.jsp
	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