test de scene
Merge branch 'master' of https://github.com/sylafrs/rugby

Conflicts:
	Unity/Assets/Scene/melee.unity
	Unity/ProjectSettings/EditorSettings.asset

Signed-off-by: Maxens Dubois <maxens.dubois@gmail.com>