Merge branch 'master' into terencehill/newpanelhud

Conflicts:
	qcsrc/client/hud.qc

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/Main.qc
Simple merge

diff --cc qcsrc/client/hud.qc
Simple merge

diff --cc qcsrc/client/scoreboard.qc
Simple merge

diff --cc qcsrc/common/util.qh
Simple merge

diff --cc qcsrc/menu/xonotic/util.qc
Simple merge

diff --cc qcsrc/menu/xonotic/util.qh
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge