Merge branch 'master' into Mario/mutator_minstagib

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

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

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

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

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

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

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

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

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

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