Merge branch 'master' into terencehill/dynamic_hud

diff --cc defaultXonotic.cfg
Simple merge

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

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

diff --cc qcsrc/client/main.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/mutators/mutator/damagetext/damagetext.qc
Simple merge