Merge branch 'master' into Mario/ctf_updates

# Conflicts:
#	qcsrc/common/stats.qh
#	qcsrc/server/mutators/gamemode_ctf.qc
#	qcsrc/server/mutators/gamemode_ctf.qh

diff --cc gamemodes.cfg
Simple merge

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

diff --cc qcsrc/common/stats.qh
index 547f4b3b669029f8274cbfa30cdadecbce3d978b,b488df1cfd709edacf36401d42990adbd4f4ed93..9ff1bf4f6c0d07c6cb083080e2c7f754a9af4b11
--- 1/qcsrc/common/stats.qh
--- 2/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -107,8 -107,8 +107,9 @@@ const int STAT_HEALING_ORB_ALPHA      
  const int STAT_PLASMA                 = 84;
  const int STAT_OK_AMMO_CHARGE         = 85;
  const int STAT_OK_AMMO_CHARGEPOOL     = 86;
 -const int STAT_FROZEN                 = 87;
 -const int STAT_REVIVE_PROGRESS        = 88;
 +const int STAT_CTF_FLAGSTATUS         = 87;
- // 88 empty?
++const int STAT_FROZEN                 = 88;
++const int STAT_REVIVE_PROGRESS        = 89;
  // 89 empty?
  // 90 empty?
  // 91 empty?

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

diff --cc qcsrc/server/mutators/gamemode_ctf.qh
Simple merge