bug fix
Merge remote-tracking branch 'origin/HEAD' into HEAD

Conflicts:
	turnierplaner/src/main/java/com/exsoloscript/turnierplaner/Turnier.java