Improve maven configuration
Merge https://github.com/juherr/jaxws-maven-example

Conflicts:
	Server/pom.xml
	pom.xml