Merge remote-tracking branch 'origin/master' into samual/weapons

diff --cc qcsrc/client/progs.src
index c536ca63dcf043d61eba9e56903512fddedd93e5,114f0a5b5c77fdd666db5ae4953b653fa40302e5..d9cd16ead64f5b020633a936f2e20215a65e5d90
--- 1/qcsrc/client/progs.src
--- 2/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@@ -16,8 -16,10 +16,9 @@@ Defs.q
  
  ../common/teams.qh
  ../common/util.qh
+ ../common/test.qh
  ../common/counting.qh
 -../common/items.qh
 -../common/explosion_equation.qh
 +../common/weapons/weapons.qh // TODO
  ../common/mapinfo.qh
  ../common/command/markup.qh
  ../common/command/rpn.qh

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

diff --cc qcsrc/server/progs.src
index 037e10449c9aaa3b9e86e1beb285bd09aa2b6ddf,367e8609ded2741ab10a74503dbf7888a82bd1a6..50b3b0b81b74a5541eb8a8fe7eb3ba8151ece603
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -15,9 -15,10 +15,10 @@@ sys-post.q
  ../common/constants.qh
  ../common/teams.qh
  ../common/util.qh
+ ../common/test.qh
  ../common/counting.qh
 -../common/items.qh
 -../common/explosion_equation.qh
 +weapons/cl_weapons.qh
 +../common/weapons/weapons.qh // WEAPONTODO
  ../common/urllib.qh
  ../common/command/markup.qh
  ../common/command/rpn.qh