Signed-off-by: Maxens Dubois <maxens.dubois@gmail.com>
Merge branch 'gameState' of git@github.com:sylafrs/rugby.git into gameState

Conflicts:
	Unity/Assets/Scene/terrain.unity

Signed-off-by: Maxens Dubois <maxens.dubois@gmail.com>
Merge remote-tracking branch 'remotes/origin/gameState' into references

Conflicts:
	Unity/Assets/Scene/terrain.unity
	Unity/Assets/Scripts/Game/Global/Arbiter.cs
	Unity/Assets/Scripts/Game/Global/Game.cs
	Unity/Assets/Scripts/Game/Global/Gamer.cs
	Unity/Assets/Scripts/Game/Global/States/MainGameState.cs
	Unity/Assets/Scripts/Game/Global/UI/UIManager.cs
	Unity/Assets/Scripts/Game/MiniGames/PassSystem.cs
	Unity/Assets/Scripts/Game/MiniGames/scrumController.cs
	Unity/Assets/Scripts/Settings/GameSettings.cs

à la mano

Signed-off-by: sylafrs <sylaf@hotmail.fr>