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

diff --cc defaultXonotic.cfg
Simple merge

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

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

diff --cc qcsrc/server/bot/havocbot/role_ctf.qc
Simple merge

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

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

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

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

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

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

diff --cc qcsrc/server/mutators/gamemode_nexball.qc
Simple merge

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