created web.xml
Merge branch 'master' of https://github.com/florendg/java-ws

Conflicts:
	sandbox2/src/main/java/nl/nspyre/tgjava/webservices/sandbox2/controller/PlayerController.java
	sandbox2/src/main/java/nl/nspyre/tgjava/webservices/sandbox2/domain/Player.java
Merge branch 'master' of https://github.com/florendg/java-ws

Conflicts:
	sandbox2/src/main/java/nl/nspyre/tgjava/webservices/sandbox2/controller/PlayerController.java
	sandbox2/src/main/java/nl/nspyre/tgjava/webservices/sandbox2/domain/Player.java
Merge branch 'master' of https://github.com/florendg/java-ws