Merge branch 'hud_feature' into pull_branch

Conflicts:
	src/client.cpp
	src/client.h
	src/clientserver.h
	src/game.cpp
	src/player.h
	src/scriptapi_object.cpp
	src/scriptapi_object.h
	src/server.cpp
	src/server.h