Merge branch 'master' into mirceakitsune/sandbox

diff --cc defaultXonotic.cfg
Simple merge

diff --cc effectinfo.txt
Simple merge

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

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

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

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

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