Merge branch 'master' into mand1nga/pathfinding-optimizations

Conflicts:
	qcsrc/server/bot/navigation.qc

diff --cc qcsrc/server/bot/navigation.qc
index ee1d60ffa4422c989d23d8400e9a7225e1b7a79a,ebaf210b3c493855e071ee409de9efdf34d7c233..2d66b021327e116231d567c989b2f77c7728d388
--- 1/qcsrc/server/bot/navigation.qc
--- 2/qcsrc/server/bot/navigation.qc
+++ b/qcsrc/server/bot/navigation.qc
@@@ -644,9 -645,7 +645,11 @@@ void navigation_routerating(entity e, f
        if (!e)
                return;
  
 +      if(e.blacklisted)
 +              return;
 +
+       o = (e.absmin + e.absmax) * 0.5;
++
        //print("routerating ", etos(e), " = ", ftos(f), " - ", ftos(rangebias), "\n");
  
        // Evaluate path using jetpack