configuration for test-system
Merge branch 'master' of
https://github.com/sebastianvogel/yuma-server.git

Conflicts:
	src/main/resources/web.xml