Merge branch 'master' into Mario/ons_updates

diff --cc defaultXonotic.cfg
Simple merge

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

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

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

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

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