Merge remote-tracking branch 'origin/atheros/secret'

Conflicts:
	qcsrc/server/progs.src

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

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

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/g_world.qc
Simple merge

diff --cc qcsrc/server/progs.src
index b5307d42893dda6cbb1a8715ac92c6209a20c50e,a28405213cb90c2b7104431588448c8254f94e42..c29ac5ff965380bd8dde021b95856a8eef9a385d
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -64,7 -64,7 +64,9 @@@ vote.q
  
  playerdemo.qh
  
++// singleplayer stuff
 +item_key.qh
+ secret.qh
  
  scores_rules.qc
  
@@@ -102,8 -102,9 +104,12 @@@ t_teleporters.q
  sv_main.qc
  
  g_triggers.qc
 -secret.qc
  g_models.qc
  
++// singleplayer stuff
++item_key.qc
++secret.qc
++
  cl_weaponsystem.qc
  w_common.qc