Merge remote-tracking branch 'origin/master' into Mario/monsters

diff --cc defaultXonotic.cfg
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc qcsrc/server/command/cmd.qc
Simple merge

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

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

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

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