Merge remote-tracking branch 'origin/feature/1.3.0' into feature/1.3.0

Conflicts:
	mad-schuelerturnier-model/src/main/java/com/googlecode/madschuelerturnier/model/SpielEinstellungen.java