Merge remote-tracking branch 'origin/master' into samual/spawn_weapons

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

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

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

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