Edited Classes
Merge branch 'HEAD' of https://github.com/EXSolo/Turnierplaner.git into HEAD
Merge branch 'HEAD' of https://github.com/EXSolo/Turnierplaner.git into
HEAD

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