contactform
Merge branch 'master' into slave

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/be.deltaworx/SpringAfspraken/pom.properties
contactform ok
ok