Merge branch 'master' into Lyberta/TeamplayOverhaul

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

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

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

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

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