Merge branch 'master' into terencehill/hud_cleanups

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

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

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

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

diff --cc qcsrc/common/minigames/cl_minigames_hud.qc
Simple merge

diff --cc qcsrc/common/vehicles/vehicle/bumblebee.qc
Simple merge

diff --cc qcsrc/common/vehicles/vehicle/racer.qc
Simple merge

diff --cc qcsrc/common/vehicles/vehicle/raptor.qc
Simple merge

diff --cc qcsrc/common/vehicles/vehicle/spiderbot.qc
Simple merge