plaquage

Signed-off-by: sylafrs <sylaf@hotmail.fr>
Merge branch 'master' into plaquage
changes

Signed-off-by: sylafrs <sylaf@hotmail.fr>
Merge remote-tracking branch 'remotes/origin/master' into plaquage
Merge remote-tracking branch 'remotes/origin/fguilleminot' into plaquage
TODO : placeHolder pour l'anim et les rotations
scene
Merge branch 'master' into plaquage

Conflicts:
	Unity/Assets/Scene/terrain.unity
Merge branch 'master' into plaquage

Conflicts:
	Unity/Assets/Scripts/Game/Playground/Arbiter.cs
plaquage
Maori pas nuked et qui bouge
Merge branch 'master' of github.com:sylafrs/rugby

Conflicts:
	Unity/Assets/Prefab/Joueur_Mao_Naked.prefab
scene
fix tackle condition, team look like inspector, fix speed bug
Merge branch 'plaquage'

Conflicts:
	Unity/Assets/Prefab/Joueur_jap_captain.prefab
	Unity/Assets/Scene/terrain.unity
	Unity/Assets/Scripts/Game/Playground/Gamer.cs
merge