Merge remote branch 'origin/master' into samual/balance

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

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

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

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

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

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

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

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

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

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

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