Merge branch 'master' into Lyberta/TeamplayOverhaul

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

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

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

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

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

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

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

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

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

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