Kinext ok
Merge branch 'master' of https://github.com/EPSIProjetWatchIT/Watchit

Conflicts:
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/metadata/2a/2a608511a8d6b1e46bd7740d28751490
	Library/metadata/d3/d385876178988c84a9b87bd50ed83640