Merge branch 'master' into TimePath/experiments/csqc_prediction

Conflicts:
	qcsrc/server/cl_physics.qc

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

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

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

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

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

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

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

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