Merge branch 'master' into Mario/ctf_updates

Conflicts:
	qcsrc/server/mutators/gamemode_ctf.qc

diff --cc gamemodes.cfg
Simple merge

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

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

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

diff --cc qcsrc/server/mutators/gamemode_ctf.qc
index 8243bcc6ece9bd086df18fafd9b3af3bab5e29ac,4e051d197298ba1ac9cdb0b6da519a515fd42d3c..a90a626b6ec78948e3fc49be028dcaa0a80fc40f
--- 1/qcsrc/server/mutators/gamemode_ctf.qc
--- 2/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@@ -1053,8 -930,7 +1053,9 @@@ void ctf_RespawnFlag(entity flag
        flag.ctf_dropper = world;
        flag.ctf_pickuptime = 0;
        flag.ctf_droptime = 0;
-       
+ 
 +      flag.ctf_flagdamaged = 0;
++
        ctf_CheckStalemate();
  }