Merge branch 'master' into terencehill/itemstime

Merge branch 'master' into terencehill/itemstime

Conflicts:
	_hud_descriptions.cfg
	hud_luminos.cfg
	hud_luminos_minimal.cfg
	hud_luminos_minimal_xhair.cfg
	hud_luminos_old.cfg
	hud_nexuiz.cfg
	qcsrc/client/hud.qc
	qcsrc/client/hud.qh
	qcsrc/client/waypointsprites.qc
	qcsrc/common/constants.qh
	qcsrc/common/util.qh
	qcsrc/menu/classes.c
	qcsrc/menu/xonotic/mainwindow.c
	qcsrc/server/arena.qc
	qcsrc/server/cl_client.qc
	qcsrc/server/defs.qh
	qcsrc/server/g_world.qc
	qcsrc/server/t_items.qc