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

Conflicts:
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/metadata/54/546896a750224cf49b35fe53e45bda95
	Library/metadata/b3/b36112bf2c6cd184b95f0822afbb8717
	WatchIt.userprefs