Merge remote branch 'origin/master' into samual/updatecommands

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

diff --cc qcsrc/server/progs.src
index 156b6279d234232534a9af146af7771a7302afff,083feb4e219cf67936b302ca851d8398c7af387e..8bf3f0e1f5ac147e4727250de5681764c5c22c6f
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -38,18 -36,11 +38,18 @@@ campaign.q
  ../common/mapinfo.qh
  ../common/util.qc
  
 +command/common.qh
 +command/ipban.qh
 +command/radarmap.qh
 +command/vote.qh
 +command/cmd.qh
 +command/sv_cmd.qh
 +
  accuracy.qh
  csqcprojectile.qh
- ../csqcmodel/settings.qh
- ../csqcmodel/common.qh
- ../csqcmodel/sv_model.qh
+ ../common/csqcmodel_settings.qh
+ ../csqcmodellib/common.qh
+ ../csqcmodellib/sv_model.qh
  csqceffects.qc
  
  anticheat.qh