Merge avec Juju
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