Merge origin/master into develop

Conflicts:
	pom.xml
test webservice