Merge branch 'master' into Mario/ctf_updates

diff --cc gamemodes.cfg
Simple merge

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

diff --cc qcsrc/common/notifications.qh
Simple merge

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

diff --cc qcsrc/server/mutators/gamemode_ctf.qc
index aa7a8133704cf6c7c770b07cffe3c08c9e7db1fa,c9c9b4584b14af089b437c5b81f4c26e105dae95..00bbb091aa4ddf4c71095c506a5cfe41716beee3
--- 1/qcsrc/server/mutators/gamemode_ctf.qc
--- 2/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@@ -2516,9 -2182,7 +2516,9 @@@ MUTATOR_DEFINITION(gamemode_ctf
        MUTATOR_HOOK(VehicleEnter, ctf_VehicleEnter, CBC_ORDER_ANY);
        MUTATOR_HOOK(VehicleExit, ctf_VehicleExit, CBC_ORDER_ANY);
        MUTATOR_HOOK(AbortSpeedrun, ctf_AbortSpeedrun, CBC_ORDER_ANY);
-       MUTATOR_HOOK(HavocBot_ChooseRule, ctf_BotRoles, CBC_ORDER_ANY);
+       MUTATOR_HOOK(HavocBot_ChooseRole, ctf_BotRoles, CBC_ORDER_ANY);
 +      MUTATOR_HOOK(GetTeamCount, ctf_GetTeamCount, CBC_ORDER_ANY);
 +      MUTATOR_HOOK(SpectateCopy, ctf_SpectateCopy, CBC_ORDER_ANY);
  
        MUTATOR_ONADD
        {