Merge branch 'master' into TimePath/experiments/csqc_prediction

Conflicts:
	qcsrc/server/miscfunctions.qc
	qcsrc/server/miscfunctions.qh

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/progs.src
Simple merge

diff --cc qcsrc/common/csqcmodel_settings.qh
Simple merge

diff --cc qcsrc/dpdefs/csprogsdefs.qh
Simple merge

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

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

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