Fixes a few problems related to the fix of the infinite loop
Merge branch 'master' of https://github.com/khreenberg/my-champ.git

Conflicts:
	Project/src/bll/GroupManager.java
	Project/src/bll/MatchManager.java