Merge remote-tracking branch 'origin/master' into Juhu/strafehud

diff --cc _hud_common.cfg
Simple merge

diff --cc _hud_descriptions.cfg
Simple merge

diff --cc hud_luma.cfg
Simple merge

diff --cc hud_luminos.cfg
Simple merge

diff --cc hud_luminos_minimal.cfg
Simple merge

diff --cc hud_luminos_minimal_xhair.cfg
Simple merge

diff --cc hud_luminos_old.cfg
Simple merge

diff --cc hud_nexuiz.cfg
Simple merge

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

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

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