Version 3.0b
Version 3.0b
Merge branch 'master' of https://github.com/CytraL/HClient

Conflicts:
	src/game/client/components/players.cpp
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h