Merge branch 'Neal_UI' of https://github.com/tghocutt/Dotflow

Conflicts:
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/00/00000000000000006100000000000000
	Library/metadata/14/144032073d79c0644914a9fa2b44ce33
	Library/metadata/9e/9e5eed2d0075c45a2b9dad118b4a3ecb
	Library/metadata/b9/b9484a0ade2dcfe49830af313250c3ce
	Library/metadata/d7/d76cce1d794620346b2ef8868ec101e5
	Library/metadata/e4/e4e97d23f9bd614429d7e119e5d3cc51
	Library/metadata/ee/ee72fbea51aca2f40b0e33c8ad517ecd
	Library/shadercompiler-1.log
Updated menu folders layouts.
Merge branch 'master' of https://github.com/tghocutt/Dotflow

Conflicts:
	Library/AssetServerCacheV3
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/00/00000000000000002000000000000000
	Library/metadata/00/00000000000000003000000000000000
	Library/metadata/00/00000000000000004000000000000000
	Library/metadata/00/00000000000000004100000000000000
	Library/metadata/00/00000000000000005000000000000000
	Library/metadata/00/00000000000000005100000000000000
	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/0000000000000000b000000000000000
	Library/metadata/00/0000000000000000c000000000000000
	Library/metadata/00/005656bced889b542a3bf808084700f8
	Library/metadata/01/01ac33954b739454f87a1848e7824f63
	Library/metadata/01/01d0c936148ad12428775a54119f5c04
	Library/metadata/01/01f56f181ea2d8a48a86f054474988e1
	Library/metadata/03/03b025823c7e4914da7f51b1756e5e3a
	Library/metadata/04/0428f8f60fa9fc44fbc83b1388991bca
	Library/metadata/06/0606e17ebdec67a439fef9b77176fabd
	Library/metadata/06/06eebca37e4cccd498dc5d3050afb3d5
	Library/metadata/07/070666400d49df049a7f49d6a33defa6
	Library/metadata/09/0939ed6c7613e5e43a5cdc04a678a966
	Library/metadata/09/09c208b4ec7eade48a2fd29a6b4990e2
	Library/metadata/0a/0a4a878577c88654795d8c6aee74368d
	Library/metadata/0a/0a5a55ad607f621418e7ca710de5ba04
	Library/metadata/0c/0c5e6f3665051a24c8deca6e53bdc587
	Library/metadata/0d/0d2934d77585b8f4ab5725d4e57ed6a5
	Library/metadata/0f/0f535c2ed68d82f40bb5dd0bf543dab4
	Library/metadata/0f/0fd5d53f79c9f4b13a8317269f02c776
	Library/metadata/11/11da5cfbff37afd419617e96054d5401
	Library/metadata/14/144032073d79c0644914a9fa2b44ce33
	Library/metadata/14/14ad1d2e194edae4a832ab596261ca59
	Library/metadata/14/14fe17db4f51e4d4b9b0f63f3fdc8600
	Library/metadata/16/1682092270f88d04bb434756a984ea87
	Library/metadata/16/16baf8473dcd4ed458e3b1f66944155d
	Library/metadata/18/182695e850938314fa6675a8926ad9ee
	Library/metadata/18/18b12ef6477c5d34faa97226b8055166
	Library/metadata/19/19efe962ed720b24e94743b984aad16b
	Library/metadata/1b/1b1aeedcfda30314c8183703eb3b1e5d
	Library/metadata/1b/1b29d356486563d479d2db3a0e1faa63
	Library/metadata/1e/1efcf3b84c99d3041b869d559d696634
	Library/metadata/20/20f7cab44eaf6e849a8b7131f390055a
	Library/metadata/25/2533dcde9be10e64f9c31912177427fd
	Library/metadata/26/268348a3ce4a06842a2701c3f9a20717
	Library/metadata/27/27275fc7df2ec0346ba12831e6a01345
	Library/metadata/27/276699a28e3b12b45b5603b31161254f
	Library/metadata/28/28ab2e93d79a347f9bcad3537472b38f
	Library/metadata/29/29136b1a63711a141bcfc47c02e4c3a1
	Library/metadata/29/298a41c43c8f58247ab89979efd1019b
	Library/metadata/2a/2a92b5d748695fd44aac9feef17ba415
	Library/metadata/2b/2b0d59a2b9c662645b1a1548e13b8b5e
	Library/metadata/2b/2bb78ce364f54594a97ba5f358f5638c
	Library/metadata/2d/2db969756433ebb46a2a069c1ef5190e
	Library/metadata/2f/2fa299741bd124248bc36d657eb4e432
	Library/metadata/30/307cac796b73e6443bfffe5622171f55
	Library/metadata/31/31320d95f085b244da859514fb70c620
	Library/metadata/31/3179bb385b3703449b588ae70428dd3d
	Library/metadata/32/3252a30d465510240a0005e27f7d994f
	Library/metadata/33/33872ef6c1d9b03418a3c571f1e6bcc4
	Library/metadata/34/34598662602230e4281f2aba2397b578
	Library/metadata/34/349118c2d8d95a240892835f9a939619
	Library/metadata/35/35452be164663f146b8829318f9c05eb
	Library/metadata/35/35664f5772e49ac408f3c841391d67a8
	Library/metadata/36/36c8a53d7be38a84db9c207c00fa2f5b
	Library/metadata/36/36ddaf8edeaf09340864edef0b9ba31e
	Library/metadata/36/36e1d3a725d052b48a97f62725e5f50e
	Library/metadata/37/37590480333382341b5007dec2a032c6
	Library/metadata/37/37a3e1d19b6969b46a04f454ed40a42a
	Library/metadata/38/386b367291644dc4a994cfd6f330d40f
	Library/metadata/3a/3a02d27ea09f7854ab4409b51c84dfe1
	Library/metadata/3f/3f21c51d36eed214682950784e00f775
	Library/metadata/40/40a2016e97c8841c997f60b964f643f3
	Library/metadata/45/45d02d8d61ab82148beaa0e15dead959
	Library/metadata/47/474217fc05d321a42a8e55d9b14c7f0a
	Library/metadata/48/482662a4f1333fc4ca45ef90de7704d6
	Library/metadata/4a/4a174c184f3bb47d6b3b0eee9c1fbea8
	Library/metadata/4b/4b5844c4c66f34d45acb150ff8077ebd
	Library/metadata/4c/4c4e2225904897741851cb40a292d928
	Library/metadata/4c/4cc8814ed8715f445bad8716f0a84360
	Library/metadata/4c/4cd39bda2d8bf48d1927218f43a3df3d
	Library/metadata/4c/4ce8870731577774ca0eb464c9698902
	Library/metadata/4e/4e131a19682f7da4995b1ed5f1db5725
	Library/metadata/4e/4ecb26c462ed72b4dbfba168ff91e2fa
	Library/metadata/50/505a4aa2be60a31478dc1897f8d21084
	Library/metadata/51/51decac5933324a4ebb5df8e33571cc3
	Library/metadata/52/52345d7deca6f844e9aed924a00fcc2c
	Library/metadata/53/53c9f540c7228b54e8593bc0b0db1415
	Library/metadata/55/554e20056aaac284ab56c431c6af0c5b
	Library/metadata/56/5679168ed7d9751468281847b1e4f513
	Library/metadata/57/5705f2fc1302ea340a90c9525cc0428b
	Library/metadata/57/57233c6ecf2fc0c4e879d17d552e63e3
	Library/metadata/5b/5b6ec4fe21bb1334b996b6bf635a29d7
	Library/metadata/5d/5d0b72844a3f544dc8625045b4aecd34
	Library/metadata/5e/5e6d8741e470af94285133f16475be43
	Library/metadata/5e/5e82b392f79aa394fb1a579743600d5f
	Library/metadata/5e/5e89a6bd2faf12145b9ec77fa3de6258
	Library/metadata/62/626f82a3943eec6468bd1b085d8fb907
	Library/metadata/64/64bcea337c8d18f4a9055c56dc45e63e
	Library/metadata/65/651a1500e5e710b4b94d6b620741138a
	Library/metadata/65/65bcc838528755f4e8a6592ad7dcc4ed
	Library/metadata/65/65ca32170bb371f459991a5d7696a9ba
	Library/metadata/66/662793f87f677d44d85639d75a73ba46
	Library/metadata/6a/6a6ec181c9b0efd4e8876a88ebf2b8ff
	Library/metadata/6c/6c9846aeba5aa40c79a3401c59ee627c
	Library/metadata/6c/6cfd453c36386934689fb42db3299dbc
	Library/metadata/70/708e630e301aadf48bb95a46c94b911e
	Library/metadata/71/71653ee8cab41304bbd53f3e5aee2f21
	Library/metadata/72/7280812eccadc1e47b7402e6d9679e5c
	Library/metadata/73/737211ff6e83c5f4babd40d5cc5b2e94
	Library/metadata/74/7402991624affad4e8d5883c88fe4984
	Library/metadata/74/745f5928c8c612a45bc36f1bf3abb156
	Library/metadata/74/74e48432f870bb548aa4269a5f4d85b0
	Library/metadata/76/766942a75e07e4b44b3d17844bc185fb
	Library/metadata/77/773417da4aa1b46409bd1e7574dcb251
	Library/metadata/7a/7abc1bfabe3adb741a055c1da2f6f43f
	Library/metadata/7c/7c0a1aa668787ad42a48d1a535825520
	Library/metadata/7d/7d9c1ac4eded11d46b40e7949b834ca1
	Library/metadata/81/8169f2b1f609f6a40bccb3984082e45f
	Library/metadata/82/822d0fd127d4ff54bb00fe332e9da64d
	Library/metadata/83/8307261b94c5d8a4f99775a836199d20
	Library/metadata/83/83d67a4d19a9444f1bf70bcb6721b5d7
	Library/metadata/84/84452ebdf1d03574eb08be1965575a28
	Library/metadata/89/89640f6506114154a820326d9af6b1eb
	Library/metadata/89/89ad5c26dbeb8bc409d4325e5193fba4
	Library/metadata/89/89e97d4664617e741a4f45225afb3dec
	Library/metadata/8a/8a499e7c18f95184e9df7b63d375f25b
	Library/metadata/8d/8dbe00b5349edd843a205c7af7250b0e
	Library/metadata/93/93c84009f8f004b4f84697c8cb12dd63
	Library/metadata/94/94b41969089e2534f847566630c65306
	Library/metadata/97/97009df997e120c4b8cd27aaf535a7eb
	Library/metadata/98/987a2b1e1974477429a35863afff9c4a
	Library/metadata/9d/9dea8a158a69bed4fa95c4876b3a9c86
	Library/metadata/9e/9e5eed2d0075c45a2b9dad118b4a3ecb
	Library/metadata/9e/9ea6b02917b630644ad13e20afbe4f6e
	Library/metadata/9f/9f39f1d1f2f3ee04bb793082eee05819
	Library/metadata/9f/9f6d6da0f43a6463781113a536b01ead
	Library/metadata/a1/a11c15d03723f5d4898122ca4176e6d4
	Library/metadata/a1/a1a629371c484164e85541902c003f93
	Library/metadata/a2/a296b1d27462d2546be67012ea4cdada
	Library/metadata/a6/a6bdd27938945f0449bc8fe7947f2bf2
	Library/metadata/a7/a73c6b887577b4f8cb40937ad5db4f2d
	Library/metadata/a8/a80b083b154188a46a548a60d50bce98
	Library/metadata/ab/ab4b41aa0a43dcc48a386073b6a1a0d9
	Library/metadata/ac/acf5d72414c5b4b48a79011f93672118
	Library/metadata/ad/ad605b00a9a05b144b1166eb27f31ec1
	Library/metadata/ae/ae1b853772f4c124ab62237544255ba4
	Library/metadata/b0/b09fc2071423c284e996ba2c5ca29464
	Library/metadata/b5/b5083cfe83bb875479bd797c61594131
	Library/metadata/b7/b7b5ccaa3ff373a4ea0eb310cb86421d
	Library/metadata/b9/b9484a0ade2dcfe49830af313250c3ce
	Library/metadata/b9/b9a620564dcfe3343a4fa9c943d1d736
	Library/metadata/ba/ba3fb0ff29025d441bcfac317f4d4b33
	Library/metadata/be/be00038a06ffa43f9beb0d809acb8887
	Library/metadata/be/be51b41498299534f9f6ba11cafb6b98
	Library/metadata/bf/bf5e7f387aefcf54582d44890a675b2d
	Library/metadata/c0/c061c57dea2f1c447a54448b3d7c441b
	Library/metadata/c1/c128e4bf7dfe2ff48ab74dbb3055c398
	Library/metadata/c1/c16e3626e0b67354ca33cb38b1e9cac8
	Library/metadata/c5/c56710aac7fb7714fabd339ec0832f7b
	Library/metadata/c5/c593199a0451b5247b56b330a0373e2e
	Library/metadata/c7/c714d7632e59ce642b7aec3d035fee8c
	Library/metadata/c7/c7443c9a986c8a2458de5ddf18099359
	Library/metadata/c8/c84fc0455e556574fb9eae102e8905e1
	Library/metadata/c9/c98890007a14b3940a04585ef65e2b54
	Library/metadata/ca/cab912f3009b43843b0a48ac3120c6ad
	Library/metadata/cf/cf9ebc36d43f657468fecb524763e3bc
	Library/metadata/cf/cf9f82e9121954e4ab411f5c174b53ce
	Library/metadata/d0/d07112ae35e3b49439de26a882a05e95
	Library/metadata/d1/d1ba9e7ba321b2c4d97f6a19f1deab6a
	Library/metadata/d1/d1ebcd00c1d17d441abe69a60007327e
	Library/metadata/d2/d294f61111202e74bb9ff1fbb2c5aaa6
	Library/metadata/d2/d2b5597d5318d4897a47aae9cda25db1
	Library/metadata/d4/d4b622e2ae4b7aa4abf761706845a53f
	Library/metadata/d7/d711703021128413a9ec1e5635877a44
	Library/metadata/d7/d76cce1d794620346b2ef8868ec101e5
	Library/metadata/d8/d8a5023ae770f544daa6fa985a17802c
	Library/metadata/d8/d8f05a96f6d43d442a884ea5ba44713c
	Library/metadata/d9/d90198e2496d3cd4e8953a18eeae0b9d
	Library/metadata/d9/d9bd30f0086842a46b831d7e11af42a5
	Library/metadata/da/da323e2b403b83f48a9c5bc9e05ec0cd
	Library/metadata/da/da3340da097d9134a8011524cdf1db96
	Library/metadata/da/da75cc62cdbce4855bbeb48963d3c20f
	Library/metadata/dc/dcd8bc4cc1c5f6f419adb680f244808f
	Library/metadata/de/de8aa54045770a84ab93ebe04831dcba
	Library/metadata/e4/e4e97d23f9bd614429d7e119e5d3cc51
	Library/metadata/e7/e75727d9555d9d14ca51d91908c681bc
	Library/metadata/e9/e950636c300acaa45a3365cbe5b186ab
	Library/metadata/e9/e9bef69d3483c064f88f285d261cbd10
	Library/metadata/ea/eaa94e92486cf4fbba639daba2e725e3
	Library/metadata/ed/ed5591596df551e4c8f4b05ce88a7a07
	Library/metadata/ed/ed64773f587bb9846918065b72c58283
	Library/metadata/ee/ee72fbea51aca2f40b0e33c8ad517ecd
	Library/metadata/f1/f179cb5ecea510d4983ccae256a008ac
	Library/metadata/f1/f1f9c736228c5e6418db57dd42570c03
	Library/metadata/f3/f3fd145b191cf4040ac6b55cda352a53
	Library/metadata/f4/f47fc3bd19d9b4fde8f1e9c3a3915437
	Library/metadata/f4/f4f0faf73e6bf89419cf29b611f29ade
	Library/metadata/f5/f5949771cb7bf2144b457d1226aaa7b5
	Library/metadata/f7/f7405180428fe944f9c9e0185cf9366e
	Library/metadata/f8/f801416effc99aa46b3cf89b61a49c6e
	Library/metadata/f8/f8c85edcf44b7ad44bc07810eafccb18
	Library/metadata/f9/f9585a629f3ca7a41863121f0b99af20
	Library/metadata/fa/fa03db53fc3242f46a6d51a2b5a59b35
	Library/metadata/fc/fc6b8e4c617310a4fb90500dbdab4e56
	Library/metadata/fc/fce4680d39b38ae4fb4aa6a03f8f3b67
	Library/metadata/ff/ffe6a388a543b98488dfeec1e73a8c9e
	Library/shadercompiler-1.log