Merge branch 'master' into Mario/entcs

diff --cc qcsrc/client/_all.qh
Simple merge

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

diff --cc qcsrc/client/hud/hud.qh
Simple merge

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

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

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

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