Merge branch 'master' into Mario/weapons_fpsfix

diff --cc qcsrc/common/models/model.qh
Simple merge

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

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

diff --cc qcsrc/server/weapons/weaponsystem.qc
Simple merge