Ok, good luck teun
Merge remote-tracking branch 'origin/develop-camel' into develop-camel

Conflicts:
	src/main/webapp/WEB-INF/spring-ws-servlet.xml