Saut pour le saut et les collisions dangereuse
Merge branch 'master' of https://github.com/EPSIProjetWatchIT/Watchit

Conflicts:
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/3a/3a2a290272ce49846a842c7f1a9b7c63
	Library/metadata/91/91b2c07399a109c458587c16b2f8c3ba