Merge branch 'master' into Lyberta/TeamplayOverhaul2

diff --cc qcsrc/server/command/cmd.qc
Simple merge

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge

diff --cc qcsrc/server/defs.qh
index 908d99444887f43ebeef093a34039fc532d08089,3aed06ee41a22b66d9cb69e1357628e91c90d480..f1299bf30d0ae141dbcb01c9a4e32baf74f223f0
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -354,7 -354,9 +354,7 @@@ const int ACTIVE_TOGGLE    = 3
  
  //float serverflags;
  
- .float player_blocked;
 -.int team_forced; // can be a team number to force a team, or 0 for default action, or -1 for forced spectator
 -
+ .bool player_blocked;
  
  .float revival_time; // time at which player was last revived
  .float revive_speed; // NOTE: multiplier (anything above 1 is instaheal)