Modification auto
Merge branch 'master' of https://github.com/EPSIProjetWatchIT/Watchit
truc auto
Merge branch 'master' of https://github.com/EPSIProjetWatchIT/Watchit

Conflicts:
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.asset
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/metadata/28/28ef6e2d9644a1240a988d74b42d86bf
	Library/metadata/d3/d385876178988c84a9b87bd50ed83640