Merge branch 'master' into develop

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

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

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

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

diff --cc qcsrc/client/weapons/projectile.qc
Simple merge

diff --cc qcsrc/common/turrets/cl_turrets.qc
Simple merge

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

diff --cc xonotic-client.cfg
Simple merge