Merge branch 'master' into Mario/monsters

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

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

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

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

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

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