Refactoring
Refactoring
Merge branch 'master' of https://github.com/JoshShangTsung/HB-Shadow

Conflicts:
	src/hgserver/Game.cpp
	src/hgserver/Game2.cpp