Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

diff --cc defaultServer.cfg
Simple merge

diff --cc qcsrc/client/view.qc
index d3c1314cd671fdea4bcfa936e26dc9487f0e9b8a,95a437e926dac488d40dfe96b8e879c5df7bcaf7..7808ebce29026c16ad0806988fadc6170e9133e7
--- 1/qcsrc/client/view.qc
--- 2/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@@ -30,8 -30,8 +30,9 @@@
  
  #include <common/vehicles/all.qh>
  #include <common/weapons/_all.qh>
 +#include <common/mutators/mutator/overkill/okvortex.qh>
  #include <common/viewloc.qh>
+ #include <common/triggers/trigger/viewloc.qh>
  #include <common/minigames/cl_minigames.qh>
  #include <common/minigames/cl_minigames_hud.qh>
  

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

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