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

diff --combined qcsrc/server/progs.src
index c053af9671358118e6ab6399ea421433cba79db5,4dde8f22bae838af22ae430c833f9194225b064e..0a1daf78412706a47955af08436775c8be034689
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -64,6 -64,7 +64,6 @@@ portals.q
  
  g_hook.qh
  w_electro.qh
 -w_laser.qh
  
  scores.qh
  
@@@ -139,7 -140,7 +139,7 @@@ antilag.q
  
  ctf.qc
  domination.qc
- mode_onslaught.qc
+ //mode_onslaught.qc
  //nexball.qc
  g_hook.qc
  
@@@ -208,6 -209,7 +208,7 @@@ mutators/gamemode_nexball.q
  mutators/gamemode_keyhunt.qc
  mutators/gamemode_freezetag.qc
  mutators/gamemode_keepaway.qc
+ mutators/gamemode_onslaught.qc
  mutators/mutator_invincibleproj.qc
  mutators/mutator_new_toys.qc
  mutators/mutator_nix.qc