Merge branch 'master' into Mario/wepent_experimental

diff --cc mutators.cfg
Simple merge

diff --cc qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/nix/sv_nix.qc
Simple merge

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

diff --cc qcsrc/common/weapons/all.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/fireball.qc
Simple merge

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