Dependency to service-proxy-core is mandatory.
Merge branch 'richtig'

Conflicts:
	pom.xml