merge
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/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/13/13cfdd77dd4c1634c95b73211be8f1fe
	Library/metadata/20/2019ee91c6c25d54da00e3d93fba0cc6
	Library/metadata/48/48db2b8fc426879428627fe1f11b449a
	Library/metadata/49/495f6eb8be10d7442bde94ee06b6b138
	Library/metadata/5f/5f02dd169444d4b4bb641801f416eebc
	Library/metadata/67/67c155c08d2087f48bc84070e25da137
	Library/metadata/75/75925d2c539c2c34f81f56b238bcaf1b
	Library/metadata/8f/8f0aa2397b67c0348a546fa5139ec16d
	Library/metadata/a9/a9a18e8c5da9c71468368e0147bffd87
	Library/metadata/b5/b5eaa80254dedd24cb31514001e1633f
	Library/metadata/bd/bd1c34707fdd28145a4734cc2e8a46f2
	Library/metadata/c2/c28dde3149f105842a035c5240fd1441
	Library/metadata/d3/d3cf46a2157a3cf47bb8b2dec38c5437
	Library/metadata/db/db17fa7691fbd7b488c92bbdb6a13997
	Library/metadata/e6/e6254020218e1de47a079a9205b81434
	Library/metadata/ee/ee768b292f35abc409f7a5b75d3830af
Correction Saut, Commencement Chateau