Merge remote branch 'origin/master' into fruitiex/animations

Conflicts:
	defaultXonotic.cfg

diff --cc defaultXonotic.cfg
Simple merge

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

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

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

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

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

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

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

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