kinect etude pause
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
	WatchIt-csharp.sln
	WatchIt.sln
update chateau
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/67/67c155c08d2087f48bc84070e25da137
kinect castle
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/20/202f65ac81f3aa245a1a290d549d4a5b
	Library/metadata/64/64bbd188967c2bf4a8db5c9b39fcc784
	Library/metadata/71/719298babe64bc34cac736d2a0b9c0fd
	Library/metadata/b5/b5eaa80254dedd24cb31514001e1633f
	Library/metadata/ec/ec1de1260a6372242bdcdcd24f7f6d5e
kinect mouve + gesture chateau lancement A tester