Merge branch 'master' into mirceakitsune/universal_reload_system

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

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

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

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

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

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

diff --cc qcsrc/server/w_porto.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

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

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

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