Merge branch 'master' into Mario/csqc_muzzleflash

diff --cc qcsrc/common/effects/all.qc
Simple merge

diff --cc qcsrc/common/effects/all.qh
Simple merge

diff --cc qcsrc/common/mutators/mutator/overkill/okhmg.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
Simple merge

diff --cc qcsrc/common/weapons/all.qc
Simple merge

diff --cc qcsrc/common/weapons/all.qh
Simple merge

diff --cc qcsrc/common/weapons/weapon/arc.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/devastator.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/minelayer.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/vaporizer.qc
Simple merge