Merge remote branch 'origin/master' into samual/hud_updates

diff --cc defaultXonotic.cfg
Simple merge

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

diff --cc qcsrc/server/autocvars.qh
Simple merge

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

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

diff --cc qcsrc/server/w_electro.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_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_rifle.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_uzi.qc
Simple merge