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

Conflicts:
	Unity/Assets/FBX/jap_captain/JapanAnimationTree.controller
	Unity/Assets/FBX/maori/MaoriAnimationTree.controller