Merge remote-tracking branch 'origin/Patrick27Octobre'

Conflicts:
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000002000000000000000
	Library/metadata/00/00000000000000004000000000000000
	Library/metadata/00/00000000000000004100000000000000
	Library/metadata/00/00000000000000005000000000000000
	Library/metadata/00/00000000000000006000000000000000
	Library/metadata/00/00000000000000006100000000000000
	Library/metadata/00/00000000000000007000000000000000
	Library/metadata/00/00000000000000008000000000000000
	Library/metadata/00/00000000000000009000000000000000
	Library/metadata/00/0000000000000000a000000000000000
	Library/metadata/00/0000000000000000c000000000000000
	Library/metadata/02/0299a3b2bb58cc54a89da4c47660c760
	Library/metadata/03/03d535d453d39414b88b6014810cfc8d
	Library/metadata/08/08418a1526c2c5f45998adcb57708412
	Library/metadata/08/08fdb0c6ca33f974cb89c09d8c9024ac
	Library/metadata/09/099c91ad0ae04d44c8b9613157135ea9
	Library/metadata/09/09e53a3391d989f42afe3beb44055ad4
	Library/metadata/0a/0a7928cfb1d1d4ad6af494359c888c4d
	Library/metadata/0b/0b85b6e100b0a43b99f8ccd0987d103a
	Library/metadata/0c/0ce4ac6bf5a93ea4ab3543b87a0bd917
	Library/metadata/0d/0d2e780e4ebee1e449223b6dd43b59df
	Library/metadata/0d/0d7b81d2f3bcabc4a844f5861542f73e
	Library/metadata/0e/0efab2b481135174b8b367540af42f2a
	Library/metadata/0f/0fdb17dcb55305144af27d56c03b344f
	Library/metadata/10/106d3789a8df641078e502d6f90bad05
	Library/metadata/12/1245679ba1f538f4c8f597d536fc06eb
	Library/metadata/15/1582a6f8a21d6c741b11b1f98c55f406
	Library/metadata/15/15d503f05a3abc84c9cb9817ad56bc0a
	Library/metadata/1c/1c4a5afb82c99bf45af7a94098365322
	Library/metadata/1c/1ce954f7ca738ce4ca425005ddf66822
	Library/metadata/1e/1e484e4e21a3aca43916c239bb233bdc
	Library/metadata/20/2000e27af5b1c424ca32442ea4f51300
	Library/metadata/22/22a89c9b587e46741b4ec31da3a81f75
	Library/metadata/23/23d9a48267858b2448a68504af9fb8f5
	Library/metadata/27/272e3a3a8c6ff4793896468962c78a94
	Library/metadata/29/29e4893684ce55d46b66b219d7b6c522
	Library/metadata/2c/2ca5a4c3314890a46be5b1c55590e4af
	Library/metadata/2d/2df098cfe9332b944ad8c17f6c5a2da2
	Library/metadata/33/33924a6ef8f719549a6fe39007ce508c
	Library/metadata/35/359f7eff15d6683438bad494c0585151
	Library/metadata/35/35ab4f4d692cec842a73a03834ab371d
	Library/metadata/36/367d5e6919f684b709961f6fa01945f0
	Library/metadata/37/37269e99c3269614ea2ddfb3b6de5f02
	Library/metadata/39/39e4e1c070b9b344e877fa6b5565d52d
	Library/metadata/3e/3eca6d78846948a4d8c051c379aedbaf
	Library/metadata/3e/3ee96595081a3e1448ceffe5b3c98830
	Library/metadata/40/407c3856caa889c4c921dcdf06c3860a
	Library/metadata/40/40f41acb04a6089439f4cd6a68752c28
	Library/metadata/43/4324ab8cd71f53445acda58d4cf11be6
	Library/metadata/45/451e15d78fd88964aaf33a56b02d0791
	Library/metadata/45/4553f10bf1d0b614682ea3f981a96f96
	Library/metadata/45/45f09a02ae386904b81bfdf76c8897fa
	Library/metadata/47/47fbc659316e54a1e8853ed22fb66340
	Library/metadata/49/4966a11086876184dbaca8ad9d856b68
	Library/metadata/4b/4b031940bd38e47469cd31419e23b864
	Library/metadata/4b/4bc73ad7319a94ee193b841f7365db36
	Library/metadata/4b/4bf7424482e2fb747ae622b8c2f1ac9f
	Library/metadata/4c/4c5fdf457aaab8848955d120f77107f4
	Library/metadata/4c/4c6f7a5a175682d4cbdabfbe0c664041
	Library/metadata/4d/4daaa73e99bf448448f4875cd68fe90e
	Library/metadata/53/53005bc0bc09260448a34b35bcd6dfd5
	Library/metadata/53/5326d315e437b7e4c93c2344f1319de2
	Library/metadata/55/55bf0a5a38f631c47b6aa8bb77d25012
	Library/metadata/5a/5a29af3c1b6757f4a9928e0b0f9d42d8
	Library/metadata/5e/5e2c41e561e3f044ba3b707ea7bac1aa
	Library/metadata/5f/5f2e9438ec959ee44824d5a02ed54e09
	Library/metadata/5f/5f745330c8f4948419a34dcad578a085
	Library/metadata/60/6063597bee007da4f986ff57987a48ed
	Library/metadata/66/6689c48f222e41145ad67fca1a84b141
	Library/metadata/68/687a7430e471142bdac363a43bbf75ae
	Library/metadata/68/68d6d96ddd41047e49ffc9cb56cdb376
	Library/metadata/6a/6a91f468aeaf2448193408349667a877
	Library/metadata/6a/6a942b3421246014e969871e8fed94e8
	Library/metadata/6f/6f09bf4d187e55c40bcfe7e830a74c36
	Library/metadata/6f/6f37d136c03c3d946b9d1929342268ff
	Library/metadata/70/70bdffaee9cf728458b92650b165d655
	Library/metadata/71/713fdfc68187a31458eae1660780c51f
	Library/metadata/71/71c72e9c236578848a79603e73e95c19
	Library/metadata/71/71da5af278a114f979d28eea3b67002d
	Library/metadata/72/72549188fc53bc04c9ee16903b2683c5
	Library/metadata/72/72af3eb488a89da44ae3898cab7cab10
	Library/metadata/72/72d0e30a4419e9f43855707b796a7b91
	Library/metadata/74/74dc06be8cc8ebe40a720951de748c60
	Library/metadata/75/7517e1e3719254767be9b19642a7264e
	Library/metadata/75/75d3fe41836fca747947856cd230fc6e
	Library/metadata/77/774edc09476d24f4faa82b60226988f0
	Library/metadata/7a/7a56849af1db386458da76cc91811e65
	Library/metadata/7b/7b9f098a2dafd8a4eb853c4cbf1bca2b
	Library/metadata/81/81ed5e507bec7d14da14e9acb311b583
	Library/metadata/84/840c7f48da4765d4a971feb80147a41c
	Library/metadata/84/846b16fc7a082df419d090a47dc19f68
	Library/metadata/84/8483347474bae934186844c933d9fb15
	Library/metadata/8a/8a0fcfe57de55a24896d705e674f565f
	Library/metadata/8b/8b6d42b1c13a3224db939c6e4e3bd0d4
	Library/metadata/8f/8f9e24c0d5eacac4c9d57eb23c248f5e
	Library/metadata/92/9243d8129231f6a409da9e3f14666edf
	Library/metadata/92/924fb1ec05275486dbb29a9b78c2e3fc
	Library/metadata/96/9698b75794c4e6747a4ce4e601daf5f0
	Library/metadata/99/99b679d55a66f964a8ba90a8f86cad1f
	Library/metadata/9f/9fce80cd39f3ebb4b9ab0dd67d817429
	Library/metadata/a1/a112306ee1c654c29a229784206146bd
	Library/metadata/a1/a133ebb7bf1da34409aa35aea5c5c206
	Library/metadata/a3/a32e4564f2133fc43986cd950cf61b77
	Library/metadata/a3/a3a0dc7567fc533489db818c4533683c
	Library/metadata/a5/a5e7981662020f14baa0948868f24b40
	Library/metadata/aa/aa1edab5df0e3374aa7d91c031522a47
	Library/metadata/ac/ac5e7554172194cebacef35b3af94aba
	Library/metadata/ae/ae289d8a85bb53a4893d44c66ae7f3a2
	Library/metadata/af/af027a7d379aa2748a0e3bc08353020b
	Library/metadata/b0/b031907cea3e2465bb1d557220e477c1
	Library/metadata/b0/b0afd8148736e744d82ee71ae35d4841
	Library/metadata/b1/b11c540cd753b445ba1e109bd2065ec6
	Library/metadata/b4/b42ce838d73c3ca4bbf59102527cdf1b
	Library/metadata/b9/b9d8eba1005680b43ac0e7bd941a1ffe
	Library/metadata/bb/bbeb8bd7408ce4dc09c1efb9e121e3c1
	Library/metadata/bd/bd704a92d3ad8a64c875bb92f02c0533
	Library/metadata/bf/bf70ecabda8d3494d9429ff1ba29c0d4
	Library/metadata/c1/c123911bbe401644a892f188b5e7e3f3
	Library/metadata/c2/c2894bd84bc0e4dfc80176bfe49b32c4
	Library/metadata/c5/c52aef455736a3841bbaddb8810c11c2
	Library/metadata/c5/c5830fd0d191647029c85f2d6f84901d
	Library/metadata/c5/c5e3615430ab07f4084ef3868fac24bb
	Library/metadata/c6/c6327a232f4c444438d650ca4787eb23
	Library/metadata/c7/c72679bbdb0e4d84a86c553c5c7b61e0
	Library/metadata/c8/c89541ec2ca394c48a1f398ac2cff73b
	Library/metadata/ca/cad6a0eeb8d55d144bf6208271581f9b
	Library/metadata/cc/ccf6a8febde71ee4fb70a6b9a3ac08d2
	Library/metadata/cf/cfc4af0daaf03db468ffca38e73ef30f
	Library/metadata/d1/d13c52fa7971c104683f8a2f1e020b7d
	Library/metadata/d1/d13e87a96a0ae514082231139d5e37a2
	Library/metadata/d1/d1c90079eb3054005a4cafb12a5709ed
	Library/metadata/d2/d213b628174cd7c42874a27766a09f09
	Library/metadata/d2/d270b3c373df2af4d927c4b658df4729
	Library/metadata/d3/d3e3cd8d25d5a437599d7cbd25a33827
	Library/metadata/d5/d57874660bf61da43be10a361645449b
	Library/metadata/d5/d5ba18ec239d9d347af75a160be622d2
	Library/metadata/d7/d776d095c6c9b5c4abe552115b22d13e
	Library/metadata/d7/d7ffd262ec2494742b15f746bdfc51f1
	Library/metadata/da/da96554c6fc65c54cb3f33dcca1a0dac
	Library/metadata/da/dafa2048b2cd8644dbec3880a2afcda4
	Library/metadata/dd/dd968e262141e984c89dd2c20a1640a3
	Library/metadata/e2/e2578c4bfbdbdb34fb04022f71ee42d5
	Library/metadata/e4/e41b44621c6a09e4985adfd4a6e9c375
	Library/metadata/e4/e424834fb09bcd843a28963193b0faee
	Library/metadata/e4/e4472144386325c4890e76549985538c
	Library/metadata/e5/e5a7b58a52bac484bb0100120b8c7c62
	Library/metadata/e7/e70f630a980184df3bc8b1dfb3b155e6
	Library/metadata/eb/eb078f5f77391274bbf82e088dcc714e
	Library/metadata/eb/eb914b3b721619f4dae050febf0d1f15
	Library/metadata/f3/f35e639f58b19481995759b3c68de97c
	Library/metadata/f9/f97c77d537a16491da3a91d6697f96f5
	Library/metadata/fa/fa6824d545699094f98c853cc319e7da
	Library/metadata/fe/fe7cb89a346a72f4d8c826ccaa90c617
	Library/metadata/ff/ff6342deed5d44be0814497f60274c21
	Temp/AudioImport.audio
	Temp/UnityTempFile-450f9e326591f4106b82c87269c7585e
	Temp/UnityTempFile-aeb2c60f00c504b2fb82a07da27ce968
	Temp/__EditModeScene