kinect grotte detec
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/expandedItems
	Library/metadata/01/01b622d4830754f4886f4b03606fb1ec
	Library/metadata/02/028c11450244e4feabe6828fc2ec3e03
	Library/metadata/04/045856ba44076bb478013081afa1a626
	Library/metadata/07/073946e94d57ac04fb345d5c28d21992
	Library/metadata/08/086544326e5604e81a96f61fb0f0a78e
	Library/metadata/08/08f28e42a647e2a4cbd32e793359aa3c
	Library/metadata/0a/0a70c16c7b47ab048bc9e03b588c24f6
	Library/metadata/0e/0e89bfe594c5e6347991ee0a96f7c030
	Library/metadata/13/13cfdd77dd4c1634c95b73211be8f1fe
	Library/metadata/16/166e4e53dec5b4b46a2eed67bba45f76
	Library/metadata/1b/1bc59e55ce32adb48bee14c092ad1572
	Library/metadata/1c/1cdade895608da64c850d40aa28b669e
	Library/metadata/20/2019ee91c6c25d54da00e3d93fba0cc6
	Library/metadata/21/215977489d11178d11005b9844295342
	Library/metadata/2a/2a49aa5b76842305fc65897abcdcf30f
	Library/metadata/2b/2b21364bb71d4eb4dbce6894c82cd119
	Library/metadata/2c/2c0b0a2a8a893ac4a91993f0c0fab659
	Library/metadata/2e/2e6dbd6b6fddc3247b9d78bd213af655
	Library/metadata/2f/2fa02947315fbaa41835dc0324338792
	Library/metadata/32/3221035c71cae8249992dd7be0eaa72f
	Library/metadata/40/405fac3d23401e84ca68692301355c95
	Library/metadata/43/43bbe182fcc084d4da54bb7b54af0635
	Library/metadata/44/44ecc2e7413b9bf4288d31c0fd39552b
	Library/metadata/48/48db2b8fc426879428627fe1f11b449a
	Library/metadata/48/48e9c233b119cda4686b42aa7f0d3d65
	Library/metadata/49/495f6eb8be10d7442bde94ee06b6b138
	Library/metadata/4c/4c6e410fea1425f4091af29d278d585a
	Library/metadata/4e/4efe5620a91cf9542993ee04a027a7f5
	Library/metadata/58/58fbeb4289c3bea418569df795b4d426
	Library/metadata/59/594dabe2753fcea49aa64fdb10e4f952
	Library/metadata/5c/5c54115eb5a2a4c4fb1b11b8e6100bd8
	Library/metadata/5d/5d69df9d9d11e49d110086ba44295342
	Library/metadata/5d/5da28d89715b85249a8ef59b430ee06f
	Library/metadata/5e/5e2041fdeb6ff7c4bb2647d3cd5f74eb
	Library/metadata/5f/5f02dd169444d4b4bb641801f416eebc
	Library/metadata/60/60fb16895cbaf4946906b6d63f3653ec
	Library/metadata/62/62f7c8a57ece2204695f3c7dc963d23c
	Library/metadata/64/642367443312c224bb40c297365867ac
	Library/metadata/65/65836931803ab5b4fb9f60bd418f4100
	Library/metadata/65/65fb74f285bbb4d11a3b64d99c0a53b0
	Library/metadata/67/6793afeb1ba524134ae93ee3038763e0
	Library/metadata/69/69cf4c86ed79f4641874f6143a7eff9e
	Library/metadata/6e/6e77d387966489d6cb6bb6ba39e09c45
	Library/metadata/72/7255397437f4e7c42be13c2029aa9b18
	Library/metadata/74/74bcba72c2286ce429281c86d5928418
	Library/metadata/74/74f4a47fc3b034e2d963491f4e514174
	Library/metadata/7c/7c98ffa948c8d43d5ac42a3e9f0ea897
	Library/metadata/7d/7dca5dff796eb47908302d505dcb19b0
	Library/metadata/7e/7e3669cf306c78f48a1f9affe08eb0f9
	Library/metadata/82/820a38890d8f1f742b289b29927ffb3b
	Library/metadata/84/84b9e1d19d11078d11005b9844295342
	Library/metadata/86/868bf2666b3dd384d97fe552fcbd66ee
	Library/metadata/89/8933fe050291d6d46a975324336878d2
	Library/metadata/8e/8e3ff3e27ca4bc54dda56e89e0550dfa
	Library/metadata/8f/8f0aa2397b67c0348a546fa5139ec16d
	Library/metadata/90/90c575b538b5916499082cb031b4cde2
	Library/metadata/94/94193cd5995960840b4e1400f36003ae
	Library/metadata/96/96558d9af5ccba84da0a06dc9afa072d
	Library/metadata/99/996f0228d03f2114bb727b5df57dce86
	Library/metadata/9c/9c89607bd2c29b9489fec73fa67a2a6b
	Library/metadata/9d/9df93f31e7395d745a1a46a455e5e6f9
	Library/metadata/a1/a12e6c74a575c20428606eb32aad918e
	Library/metadata/a4/a4c1988d864759a49a8a7e7b7504a369
	Library/metadata/a9/a9a18e8c5da9c71468368e0147bffd87
	Library/metadata/ac/acd22cefe09441d2c7e801193b935495
	Library/metadata/ad/ad90f586d4fe1b942b46f0da520a0e61
	Library/metadata/b3/b36112bf2c6cd184b95f0822afbb8717
	Library/metadata/b9/b9a268fc98c474f721ff8c9bf8f5160e
	Library/metadata/ba/ba214da11c408cb438623e5810bfc2a9
	Library/metadata/bb/bb393e804ad0e204cb1fcfbc9b8b0409
	Library/metadata/bd/bd1c34707fdd28145a4734cc2e8a46f2
	Library/metadata/c3/c3fbab2e1e19c594098c0ee85f7e9143
	Library/metadata/c7/c78b114ae617a4914a6f9b9e0f796a0b
	Library/metadata/c9/c9e6294c9d11cb8d11006bf944295342
	Library/metadata/cd/cd57f53da11ae2f4b97220e18822cf2b
	Library/metadata/d2/d236c2e07976ff942a0e23d979e8f4cb
	Library/metadata/d3/d3b7d84ffb95cc04aaeb74f19a10f034
	Library/metadata/d3/d3cf46a2157a3cf47bb8b2dec38c5437
	Library/metadata/da/da971368bee87434f86927796c5a4aba
	Library/metadata/db/db17fa7691fbd7b488c92bbdb6a13997
	Library/metadata/e0/e097e0ca551c28647a5a126e44c35bbc
	Library/metadata/e4/e4e4cff51dff43545953848c2258e62c
	Library/metadata/e6/e6254020218e1de47a079a9205b81434
	Library/metadata/e6/e667992b28845df99060a8f876d1d11b
	Library/metadata/e7/e79b4ee3b7b31ee499b1532270c7730d
	Library/metadata/e7/e7abdc488aa32db4da407783539fc241
	Library/metadata/e7/e7d408c28925be148bd9ef32f4f28e44
	Library/metadata/e9/e976c6d3ebc1e4a85aa7186a3192d8c5
	Library/metadata/ea/ea9f575585f7aa64eb228f1de83fd73a
	Library/metadata/ee/ee768b292f35abc409f7a5b75d3830af
	Library/metadata/f1/f167a71a89e1aae4e963693d487af0c7
	Library/metadata/f3/f3d66f34459704a34b36657da3964ea1
	Library/metadata/f6/f60723ea36fc34476899abc83a5309c9
	Library/metadata/f6/f643c224359ca624a95e286baf63356a
	Library/metadata/f8/f89a53f13e64bbbd73bd6eb9f8509a09
	Library/metadata/f9/f92f8a86a9b92af489ee8c50c087031e
	Library/metadata/fa/fa357e69f464e4248bb74016aabd7c1c
	Library/metadata/fe/fe5b440e167933042bc93bc53ed0c09f
	WatchIt-csharp.sln
	WatchIt.sln
	WatchIt.userprefs