Merge remote-tracking branch 'origin/Mario/quickmenu_merge' into terencehill/quickmen...

diff --cc defaultXonotic.cfg
Simple merge

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

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

diff --cc qcsrc/client/autocvars.qh
Simple merge

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

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

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

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

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