Refactoring
Merge branch 'master' of github.com:mstoma/sggw

Conflicts:
	src/halley/server/HalleyServer.java