Merge branch 'master' into Lyberta/TeamplayOverhaul

diff --cc qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
Simple merge

diff --cc qcsrc/common/t_items.qc
Simple merge

diff --cc qcsrc/server/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_world.qc
Simple merge

diff --cc qcsrc/server/mutators/events.qh
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_ca.qc
Simple merge

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