Merge branch 'master' into morosophos/server-current4

diff --combined qcsrc/common/scores.qh
index 1d4803a437f9664999b800c85bd5be471a162d46,45af93992aacdf33f7d8338867fe73a43807b2a3..2ab83409334e78a47720110489bdbc572296f6b5
--- 1/qcsrc/common/scores.qh
--- 2/qcsrc/common/scores.qh
+++ b/qcsrc/common/scores.qh
@@@ -15,7 -15,6 +15,6 @@@ STATIC_INIT(Scores_renumber) { FOREACH(
   * Score indices
   */
  
- // game mode specific indices are not in common/, but in server/scores_rules.qc!
  #ifdef GAMEQC
  // fields not networked via the score system
  REGISTER_SP(END);
@@@ -54,8 -53,6 +53,8 @@@ REGISTER_SP(RACE_FASTEST)
  //REGISTER_SP(CTS_TIME);
  //REGISTER_SP(CTS_LAPS);
  //REGISTER_SP(CTS_FASTEST);
 +REGISTER_SP(CTS_STRAFE);
 +REGISTER_SP(CTS_STARTSPEED);
  
  REGISTER_SP(ASSAULT_OBJECTIVES);