BUGUEE
Merge branch 'master' into scrum

Conflicts:
	Unity/Assets/Scripts/Game/UI/gameUIManager.cs
Merge branch 'master' into scrum
Merge branch 'master' into scrum
defini la fin
finish
barre + minigame
barre + minigame + scene
indicators
Merge branch 'master' into scrum

Conflicts:
	Unity/Assets/Scripts/Game/Playground/Arbiter.cs
commence le gizmos
Merge branch 'master' into scrum

Conflicts:
	Unity/Assets/Scene/terrain.unity
	Unity/Assets/Scripts/Game/Playground/Ball/Ball.cs
	Unity/Assets/Scripts/Game/Playground/Unit/Team.cs
Merge branch 'master' into scrum

Conflicts:
	Unity/Assets/Scripts/Settings/GameSettings.cs
Merge branch 'master' into scrum

Conflicts:
	Unity/Assets/Scene/terrain.unity
fix super bug
Merge branch 'master' into scrum

Conflicts:
	Unity/Assets/Scene/terrain.unity
mergePrefab
Merge branch 'scrumMerge' into scrum
Merge complete.. i hope
IAv1

Signed-off-by: GUILLEMINOT Florian <florian.guilleminot@gmail.com>