Merge branch 'master' into TimePath/vehicles_cleanup

# Conflicts:
#	qcsrc/client/main.qc
#	qcsrc/client/progs.src
#	qcsrc/server/progs.src

diff --cc qcsrc/client/main.qc
index 752b518bac4cfe1dbb4c661cfae61424011ffdb0,a585a136e5b8d29ab8b9c9e77b9b126649dbedf2..ca3fb3093e85e9396b1c64ac76f57151adab67a3
--- 1/qcsrc/client/main.qc
--- 2/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@@ -23,8 -23,14 +23,10 @@@
  #include "wall.qh"
  #include "waypointsprites.qh"
  
 -#include "mutators/events.qh"
 -
 -#include "../common/vehicles/unit/bumblebee.qh"
 -#include "../common/vehicles/cl_vehicles.qh"
 -#include "../common/vehicles/vehicles.qh"
 +#include "../common/vehicles/all.qh"
  
+ #include "mutators/events.qh"
+ 
  #include "weapons/projectile.qh"
  
  #include "../common/buffs.qh"

diff --cc qcsrc/client/progs.src
index 1c739ab76126c6ea1cb52998102255218b0c3f4b,43c056aa3a394132a400d8ece9468a31b64be37d..88eba6d4bba4307340778c75432f76c6347cf6fd
--- 1/qcsrc/client/progs.src
--- 2/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@@ -57,9 -57,12 +57,10 @@@ weapons/projectile.qc // TOD
  ../common/viewloc.qc
  
  ../common/items/all.qc
 -
  ../common/monsters/all.qc
 -
+ ../common/mutators/all.qc
 -
 -../common/weapons/all.qc // TODO
 +../common/vehicles/all.qc
 +../common/weapons/all.qc
  
  ../common/triggers/include.qc
  

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

diff --cc qcsrc/server/progs.src
index e13a760cbf4df64f2603d1119bcf30b7220445fe,bb6288101ce01e94791654b75636ed6bf2072df7..e5251bef3fe3ddab780b83f5bffc4d0c5e61aa50
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -101,13 -103,12 +101,14 @@@ weapons/weaponsystem.q
  ../common/triggers/include.qc
  ../common/urllib.qc
  ../common/util.qc
 -../common/vehicles/vehicles_include.qc
  
  ../common/items/all.qc
 +../common/monsters/all.qc
++../common/mutators/all.qc
 +../common/vehicles/all.qc
 +../common/weapons/all.qc // TODO
  
  ../common/weapons/config.qc
 -../common/weapons/all.qc // TODO
  
  ../csqcmodellib/sv_model.qc