Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

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/miscfunctions.qc
Simple merge

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