Merged master into Lyberta/TeamplayFixes_.

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

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

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

diff --cc qcsrc/server/command/sv_cmd.qc
index 4687403d2a0006124861a204f9e8914bf8081244,2bb0f1365c3b71aa353be44d6bc7522438344293..f5569c08f2697d4baf879ff63dc659efaaa88e74
--- 1/qcsrc/server/command/sv_cmd.qc
--- 2/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@@ -1091,15 -1095,9 +1095,15 @@@ void GameCommand_moveplayer(float reque
  
                                                                // If so, lets continue and finally move the player
                                                                client.team_forced = 0;
 -                                                              MoveToTeam(client, team_id, 6);
 -                                                              successful = strcat(successful, (successful ? ", " : ""), playername(client, false));
 -                                                              LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") has been moved to the ", Team_ColoredFullName(team_id), "^7.");
 +                                                              if (MoveToTeam(client, team_id, 6))
 +                                                              {
 +                                                                      successful = strcat(successful, (successful ? ", " : ""), playername(client, false));
-                                                                       LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") has been moved to the ", Team_ColoredFullName(team_id), "^7.\n");
++                                                                      LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") has been moved to the ", Team_ColoredFullName(team_id), "^7.");
 +                                                              }
 +                                                              else
 +                                                              {
 +                                                                      LOG_INFO("Unable to move player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ")");
 +                                                              }
                                                                continue;
                                                        }
                                                        else

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

diff --cc qcsrc/server/scores_rules.qc
index 5ee25f5bf369d4574c1d4064734672e906784c9b,2b539c999668bbcc5acca5304ef53100f7e37285..d46d95bd1c6114ee5138527c74cb726afc8a7dab
--- 1/qcsrc/server/scores_rules.qc
--- 2/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@@ -1,8 -1,10 +1,11 @@@
  #include "scores_rules.qh"
  
+ #include <server/defs.qh>
+ #include <server/miscfunctions.qh>
  #include "client.qh"
  #include "scores.qh"
+ #include <common/gamemodes/rules.qh>
 +#include "teamplay.qh"
  
  int ScoreRules_teams;
  

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

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