angepasst
Merge branch 'master' of https://github.com/muestefa/training

Conflicts:
	pom.xml