...
Merge branch 'master' of https://github.com/RogueHat/rTag.git

Conflicts:
	Game/bin/client/CollideChecker.class