no real changes
fixed some issues, dialog trigger has 3 lines
Merge branch 'master' into Ebby
Merge branch 'master' into Ebby

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scenes/Level 10 - Downtown.unity
	Assets/Scenes/Level 10 - Downtown.unity.meta
	Assets/Scenes/Level 10-Downtown.unity
	Assets/Scenes/Level 10-Downtown.unity.meta
	Assets/Scenes/Level10-Downtown.unity
	Assets/Scenes/Level10-Downtown.unity.meta
	Library/CurrentLayout.dwlt
	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/expandedItems
	Library/guidmapper
	Library/metadata/02/02902a4e68e6644af9cc20ace64ab614
	Library/metadata/04/0401f3340fc0242369b2263006aed6ca
	Library/metadata/05/0525b21cfa52e4c73a5100bcf06727ab
	Library/metadata/06/06b486aa2fda442f7b6901f514da7176
	Library/metadata/07/0740098c3f32a494090ba588266f0fe2
	Library/metadata/07/0770e13d2a8854c7ab1698cb1bb2b00a
	Library/metadata/08/0820e73e1c3d540c594ed922c04cc1a1
	Library/metadata/0a/0a324fea7217346eb8bc1fb8f1d5ad2b
	Library/metadata/0a/0aea86e3ddc3242dabe0a1d409b9613f
	Library/metadata/0b/0b065749e45d44ade9246cd6af4e180e
	Library/metadata/0d/0d7276f2379174fe3b9b7e3551f81b75
	Library/metadata/0d/0d7e91750f9554ba191b672510ec1cad
	Library/metadata/0e/0e99f90cefc1943649aa1f28217aed85
	Library/metadata/10/105b6c901d5494ecdace87c4e7571eb5
	Library/metadata/12/127635ddb66a64a84ba971a77acf96ea
	Library/metadata/13/138a71231e3f94ba28b0b6f9791ebe49
	Library/metadata/15/151006defaa3e4cd6adf1ae5ce09f9c7
	Library/metadata/15/1578491f5e2134a77a0f7d6056d5b894
	Library/metadata/15/15b64e13a5ce243aa9373fc1b355e694
	Library/metadata/17/173603b9e5d8c41f9adbeb53e27375cb
	Library/metadata/17/17af45a682c66462e9f963aef1c30ef5
	Library/metadata/18/184a5ad876b9b4687bbd2c7bed4213a6
	Library/metadata/1a/1acde6428cf364fe283475ad20930e1f
	Library/metadata/1b/1b345fd32a6eb45b6b52f306df73a771
	Library/metadata/1b/1bc0f85d627854ce9b1e59712ebd2809
	Library/metadata/1d/1d57be841f9424aff940e44062009386
	Library/metadata/1d/1d7119fccdd83440882b17b5351260cb
	Library/metadata/1d/1df1701cf589c45e5a8f75c8b86b34e7
	Library/metadata/1e/1eca9dd9e2b9c455e85eec5854408691
	Library/metadata/1e/1eece6907b4a04d28ac42383ad69533b
	Library/metadata/23/2373bbc3a13d349579d05475be48fd11
	Library/metadata/24/24e348494a7d84db7870860ed0ff2684
	Library/metadata/24/24ec539b4fcb949c3b67982a6749c1a7
	Library/metadata/25/257e2d0bf2b7f4b449ceab57b63a6092
	Library/metadata/25/25979fc38240d46c996efb8487cbcfa5
	Library/metadata/25/2597f649d519d4ed696c3c351552b9e1
	Library/metadata/26/26a8b0826647c415b893df28e503ce4c
	Library/metadata/26/26cf659cd4b1b4aedb54629a2cc60150
	Library/metadata/27/27a4d82f10e6549f2a5ed745b9c3fe4c
	Library/metadata/28/2884aaa423b8c49558eb05399e4fd923
	Library/metadata/2a/2aecfbe0e86ad4df6811883dd1e258b4
	Library/metadata/2b/2b101acf9e4e2495d93db58faf1c525b
	Library/metadata/2b/2bdf4e267b10d4b158b06a0ceadc18b2
	Library/metadata/2c/2ce0d1322bde244219cd33ab786db642
	Library/metadata/2f/2f2dd6cbfb48a4b68ac5c4584770a8fe
	Library/metadata/30/302a61e28ecf94f0cb6a34f6dd41628e
	Library/metadata/31/31173e0f982e043d49da86008f47dcf5
	Library/metadata/32/32b8e54bceb784f88a0b9e12faaa04c2
	Library/metadata/35/35c0b71a63d4f4c0a9c888a016fbe412
	Library/metadata/36/368ed2da294014ec88f90a44d51f6991
	Library/metadata/36/369866166e3b14a2d9fb8dbc3ce0aa3e
	Library/metadata/3d/3d9b6c439ac19447ab1696ab054ff0a2
	Library/metadata/3e/3e162dd91411947eaae860e44505d557
	Library/metadata/3e/3e21c9234a231476aa7dbccad01e7ca9
	Library/metadata/3e/3e62cec967ca54d99a313046cb2e7422
	Library/metadata/3e/3e88159f594ba4b8c822baf677b27a5b
	Library/metadata/3e/3e9e1a3fad62d43e0b0bdc1a92ff8025
	Library/metadata/3f/3f4d4bf959a48432983f3e9fd9c1d0d8
	Library/metadata/3f/3fd4bfe840fe54e8eba949795047468b
	Library/metadata/40/40a1b5e27b00e4a8ba9ee4c98cf1e026
	Library/metadata/43/435003bc53fe54cfa8549738219e59e7
	Library/metadata/43/436ec216e094d4081877e9fa28525ee8
	Library/metadata/44/448dbbc90ed144929a97f2314895ea35
	Library/metadata/45/45038d3ad17604b0d9cde019debba195
	Library/metadata/45/45191a64f2cab4c6b8da841a413610d3
	Library/metadata/48/485d9cc251f7149b4956680386307ac1
	Library/metadata/49/49b6189dd291440a995d19c95e1b1e4a
	Library/metadata/4b/4b4d0dfc493964a78a659bcd1966c9b9
	Library/metadata/4b/4b662db90c58f42b6937818fa0365292
	Library/metadata/4c/4c53765aa567e4f03a6c6f9999e2d519
	Library/metadata/4d/4dcd581b7783f4497b6774c77219f97e
	Library/metadata/4e/4e5c83cefb14c4dfa9d7b34a82981639
	Library/metadata/4e/4e66dea5cf1cf415683becedf97abcd1
	Library/metadata/4f/4f398045902bd4a7dbb22f7e230d8999
	Library/metadata/50/505ea58b3b1684eab97d0eb74a0383e8
	Library/metadata/50/50d111f5b5d9f4c4da03458053a4c1d3
	Library/metadata/51/51085454a57c44eb4810d8e5cf46938e
	Library/metadata/52/52a8a2eac7abc423da422c1c633763a2
	Library/metadata/52/52ba14195ca1140e49593cb03b036e4e
	Library/metadata/56/56d0dd0f83c6b4d8ca879e10d395c75f
	Library/metadata/56/56e3228a6334d436c804276aeee7888c
	Library/metadata/58/586caf85dc56145c984e81d4142469a6
	Library/metadata/58/58e1e2d81137e45ae9954d72e8b107ec
	Library/metadata/59/591458324373a474192815ae25a9b0d6
	Library/metadata/59/593af68535d1a4c09b89b5f083b3be4c
	Library/metadata/5c/5ce92dd29368c4d5fa75b7a7f40935e1
	Library/metadata/5d/5d4f1657a603447b38f29711b600d90e
	Library/metadata/60/602a88b8949bf475f82b73761d7f2133
	Library/metadata/60/606f4d514100f402286d0193934f3f66
	Library/metadata/61/61758d29a3e484db69b60b99e07ca6fd
	Library/metadata/61/619aa9cc19ad24ed3824b7837f81b6b4
	Library/metadata/62/621357b457cf94046b67a30f6f2124fa
	Library/metadata/62/62a04abde8f70466188dad9fe7a0e2b0
	Library/metadata/64/64672be65ef0c41c78b76b8463332142
	Library/metadata/64/64687af1e761f4c4d9cb76bad0c95c7f
	Library/metadata/64/64760d4841c624d9a954030922e909da
	Library/metadata/66/6656012c107a043318e2d5e99f45b6eb
	Library/metadata/66/669c67944faa747909ac8cf4f5ac5b19
	Library/metadata/66/66e82a38f39124efc840433e123d67ea
	Library/metadata/6a/6afe982f529d2482d836bc40fae057a8
	Library/metadata/6b/6b55f02d08d244c52a7bde4e23c7d516
	Library/metadata/6d/6dbc54ba286604dc997d005b9566b891
	Library/metadata/6d/6dce709c0e07c4cec83065e5a4b66221
	Library/metadata/6e/6e6f71ad41c0c40f28ba1e560d640fdc
	Library/metadata/6e/6ed659650684a474cb316ce46bc856f0
	Library/metadata/70/700629fb309a247a980bb8130bf5a984
	Library/metadata/71/71c064af8454747f599caea4efb3ac41
	Library/metadata/71/71ee99c0b729441b9917560891a4cb93
	Library/metadata/72/72f439578201b44288229540465149bd
	Library/metadata/73/7326f37c63af34c4b88e186dd6e855e7
	Library/metadata/73/73a4ae6fee2fc44bda0830a20bf6e87b
	Library/metadata/74/74c505a25bcc14f8a96fec58fcc7e8fb
	Library/metadata/74/74f6165cdc31346198c015a45d1ecc71
	Library/metadata/75/751ef9e5e531a4a9cb1cff8bee21a1bf
	Library/metadata/75/753300923fa6a4a77ab182086a6a23d1
	Library/metadata/77/77ae970e14e784834b08f9de3bc5f8bf
	Library/metadata/78/784aad15258d34709963140e92fcd50b
	Library/metadata/79/79c03794b81804bcc80e74e235f8f029
	Library/metadata/7a/7a00543f8ce1e423c966e4516380b5fa
	Library/metadata/7a/7a1dbca6b56ac4aacabf6d44c15d6336
	Library/metadata/7a/7a97be5a10bcd46ff9c89d5b3fc1e505
	Library/metadata/7b/7b647eef7e16449b9a1ed4262bb1135a
	Library/metadata/7b/7bda1f0f402e14cd9ae02ecb26758009
	Library/metadata/7c/7cef8c2b1cd1f419990a308170aa94d8
	Library/metadata/7d/7da52503ddbac4dc78dce47cd6653a7e
	Library/metadata/7e/7e296617a8355461398ddba1e18cf318
	Library/metadata/7f/7f43c711fcfd84ff6934f5b9249ff224
	Library/metadata/7f/7f9c7debeebd24fdd9c275ce785f0a71
	Library/metadata/80/8004b61d1cebe4c58b8df0051a1bd437
	Library/metadata/82/8266c195b915b470981d8b873fd4c68b
	Library/metadata/83/833bc88762d5d458bb36da306fea80ad
	Library/metadata/83/838942c00b1bb4b2b9d716d369a75063
	Library/metadata/84/84ecd6206e41749869da6210b98cd8ce
	Library/metadata/85/8585b690d615a472ca32215d10ff73d3
	Library/metadata/85/85d7584b25116473e891514ae8023636
	Library/metadata/86/866c399e1975f4c598c90aea7f1951a2
	Library/metadata/88/8834767cc946847f8bda0c1d3795c2a3
	Library/metadata/89/89ff360bd9bb44957a8616833a63b211
	Library/metadata/8a/8a23d948afa5144ada93b452601a1ccc
	Library/metadata/8a/8a2e56903973b4038be8d98705604050
	Library/metadata/8a/8a6a0458642dd4191bd799f60b040cee
	Library/metadata/8a/8a7555b0602d64d0bb482d0458bfb0f0
	Library/metadata/8b/8b9836729b9f34a5abb086a371214168
	Library/metadata/8f/8f08a23c56a6b46d9a4456096e4fa1b2
	Library/metadata/8f/8ff23c692bb9242b0933edc4c565f4ae
	Library/metadata/91/914c4ed9f3f3944a9a7d840096012423
	Library/metadata/92/9219d448fbd1649eeb975b4c15f47e2a
	Library/metadata/93/9314d75fdf7fd436cae93d948e44a6cd
	Library/metadata/95/9527ad47cd0a947cfb95c9568e278093
	Library/metadata/96/96b824aed64a247f3859fdd17fd91d40
	Library/metadata/97/9775a338178994e248947b2c17f47821
	Library/metadata/97/97a84df2468bb466b893eea1deebd4c5
	Library/metadata/98/981a2537aa1ea451287b0529699c15f8
	Library/metadata/98/98e3d6c292b69489d83dac9f49c672aa
	Library/metadata/99/994fa571976434ee3a308caaa8b06f1c
	Library/metadata/99/99bd7bee35c82439abe12032599a57bc
	Library/metadata/9b/9ba5b9b28cba049269a231786d9cb11c
	Library/metadata/9e/9e5b35c1c9cc84f08a9574f7c1f927d7
	Library/metadata/9e/9ed650f005a994739a9e3fd2fd5e2338
	Library/metadata/9f/9ff27db64c0d748df8fa10719b2dc088
	Library/metadata/a2/a213d52a5af74405fb72f8ee9908ddc0
	Library/metadata/a2/a2ddca3e6c5c14633a24ee53106c58e1
	Library/metadata/a5/a5543430d07814c6692a572a725cc962
	Library/metadata/a6/a6edc99f952794ac5a4b3ce5ea3ebe2c
	Library/metadata/a6/a6f49a18830f749088b706df189f9367
	Library/metadata/a7/a7d97864ade92499a8f38bd0e0e52c8f
	Library/metadata/a8/a819863f80d4b4e0fa3a47a8bc58ba4c
	Library/metadata/a9/a9422e15647f74985b0e3f9d6d896f37
	Library/metadata/a9/a9abfceecc3db44b9a3f426c95b7786c
	Library/metadata/aa/aa363cf245bd945f2addc37612986cb0
	Library/metadata/aa/aa92ae88d821a4851a4400a068313e99
	Library/metadata/aa/aab3b48ac618649e88a695595b465363
	Library/metadata/ab/ab3055039232b4ff7a08a5ab39755bd6
	Library/metadata/ab/ab6ea3428b949408aa4d6befcd036f8a
	Library/metadata/ab/ab8cf2ffdf5f241b297379cb389e6f95
	Library/metadata/ac/ac367411a033d4cb5b402fa6144f8250
	Library/metadata/ac/aca0964da7322472c96ecf1b884b9e6a
	Library/metadata/ac/aca461024ed274d109990580a1ae87f3
	Library/metadata/ad/ad2189e50721f402bb953cedfbf67e9a
	Library/metadata/ad/adc7897b83d534fdea8465d5a72b481b
	Library/metadata/b1/b148a09d385924216867692d7089d4e0
	Library/metadata/b1/b1ad97f5e64244b639971dc939082f4e
	Library/metadata/b1/b1cd0be1f8b9d44f8b4406d99037f9f6
	Library/metadata/b3/b34cfa396158c4f6094180ecab8bee2e
	Library/metadata/b4/b451e7ef079a64b25835f7801a60da33
	Library/metadata/b4/b4567074cce5f432682c57e4e6b35403
	Library/metadata/b5/b5b9a79d74b264dcba7d4b8beaf5ff04
	Library/metadata/b6/b6efee277818c4432adf3fd60a684e49
	Library/metadata/b7/b76c42e80d87945319b4608378c7bd98
	Library/metadata/b7/b7aaa742b953147c2b33cc2d68b6c905
	Library/metadata/b7/b7ca723cb249241b4bbbc5c7ce9e6944
	Library/metadata/b9/b915ac97b503e475aa44f7085fb096a6
	Library/metadata/b9/b93565aec83f142e8b35e917a515548a
	Library/metadata/bb/bb4895ff08e3c4499b295eaccfe533ac
	Library/metadata/bb/bb67392ec7725414aba4bd75253b7d58
	Library/metadata/bc/bc03716e972674cdab33cbd61a72cf4f
	Library/metadata/bc/bc1c5369db641417cb508c6ac059f06a
	Library/metadata/bc/bc6d041f205e24d57a4431af2bd617b0
	Library/metadata/bc/bcd7121655123435daa7bec3b05af57b
	Library/metadata/be/be5819cdefc454ec380f284d64d5ea80
	Library/metadata/be/be5973cd804064b96a0f8af73d750861
	Library/metadata/bf/bfa8b25d3b7f94dcaab986e9d8a62d4e
	Library/metadata/c0/c02275f29c6524d0c8e91bf5f60db781
	Library/metadata/c0/c0b79f47896364545a192faa093e234e
	Library/metadata/c1/c10edf642e8ba460e968b0d379d57198
	Library/metadata/c1/c17f387a9eb7645e083b0c4c25bcc43f
	Library/metadata/c2/c2ff7111baac4468fafbc5ddd4dcdb6b
	Library/metadata/c4/c44eba91adf934dd88c2575b81945822
	Library/metadata/c4/c481d14edb9d24663ad454f93b9d6c40
	Library/metadata/c4/c4855bf15d0244ee1b0331eb67931b8f
	Library/metadata/c4/c4af3c205f9454438be22c3a061aca53
	Library/metadata/c7/c782ac56f3916463da7eb3c7f20d8284
	Library/metadata/c8/c82c1f9d1444445758322516c0e22d7a
	Library/metadata/ca/ca4ffc59240f3448384e3b0a44c9d96b
	Library/metadata/ca/cab97e1b21fc147bfac21481d3387420
	Library/metadata/cb/cb61a9599839f484c9ced77178b41ae0
	Library/metadata/cc/cc14072e5fed44cadaf062ad2f7bd48c
	Library/metadata/cd/cdb8e52cc98704418aadde5d336bf595
	Library/metadata/cf/cf05fdedb035a452297c9d593c7aa307
	Library/metadata/cf/cf53726df031d414980289b7680b94d5
	Library/metadata/cf/cfaf4dfe6de01424081040c051125c87
	Library/metadata/d0/d04a10753dcf34c03830e1ba9aab0f91
	Library/metadata/d0/d05453793b35147349f4692e9e131560
	Library/metadata/d0/d09634ea972304072a28ff4eae0bc23e
	Library/metadata/d0/d0aaf250c164949a4a7566fbebee2387
	Library/metadata/d1/d1140bd835e2e43248eafeb47b95c61c
	Library/metadata/d2/d26be30e5788e4eb1a710bbfd0356b36
	Library/metadata/d3/d3e65dc47a44a4ba493046a54d9b2809
	Library/metadata/d4/d4203a0f14a284315ad0b3d4281ee014
	Library/metadata/d4/d444c3306eb0049ecaecac1c1bf1b5d0
	Library/metadata/d5/d5dacf87e272d4a50aaafd372a13ed89
	Library/metadata/d7/d7c8535cc4f454abeb00c4f957338881
	Library/metadata/d8/d81cb0ff7857d4defa02d7dcb59c06c2
	Library/metadata/d8/d869a80514b3346fea93c274e8ff8c4a
	Library/metadata/d8/d8bb0dbed09804f6bbb438404bb4917f
	Library/metadata/dc/dc402b4a5fd274b478cc8a74af314023
	Library/metadata/dc/dc5670c7ae64f41e69e5b1f3af830c8d
	Library/metadata/dd/dd632bf08de84401fb7567b0c01c881d
	Library/metadata/dd/dd6a7ead71f7b4b93918afa34d5d8cd8
	Library/metadata/de/de3789768cf2145a3a49680dc05a7546
	Library/metadata/de/deb968c2295854cc0bd7cb3160800b2f
	Library/metadata/df/df9d86a50c79546e8a95a7ca7eb43af3
	Library/metadata/e1/e123bd9f6856641e79cc0707c71b4c87
	Library/metadata/e1/e1d6c17423fbc41b085a1b7b5fcb430a
	Library/metadata/e2/e2df54d3d23a9417b8cf9b10917e67fb
	Library/metadata/e6/e601e79cf968f4ff080adee3fa627f1f
	Library/metadata/e6/e621b35e2d6ff4319b29fce5e35e3689
	Library/metadata/eb/eb80e7b9814b3443f9df0cd9a8eaec6f
	Library/metadata/eb/eb846e64223bf4701b0e5bb6d4727449
	Library/metadata/eb/eb9f6022f5e2a416aa4ab49df611442c
	Library/metadata/ed/ed2ba75a23ded428d8ca4a63febf35ca
	Library/metadata/ed/ed961fd2bbb5f4c76b19e0754807f320
	Library/metadata/ee/ee17b7ff5a6ae46f5844171d70b58525
	Library/metadata/ef/ef6cae71e4f964e7ebb9d0fd23d8022d
	Library/metadata/ef/efeb99f6774a1471e92ee66efe29942c
	Library/metadata/f1/f1cc274a3e8f44c99a39560b1552e57c
	Library/metadata/f1/f1dac5cb4448a4cc3a05037860ad8641
	Library/metadata/f3/f384087e7f22f4f1da185345111ee7fe
	Library/metadata/f4/f4036537442d2445f81536b0c9b7fd4e
	Library/metadata/f4/f46f74293c4a04e3c9faa3f06d8148ac
	Library/metadata/f5/f5d8116473f9643e28d5f7335d23e715
	Library/metadata/f7/f7b6877704cee482bace610f58e20b31
	Library/metadata/f8/f8022056f9c22406081dfd3e66106cdf
	Library/metadata/f8/f863fa512a4b34f388ddf06bddca9d1c
	Library/metadata/f9/f948a3c783fe24809bd4541f8a396872
	Library/metadata/fb/fb9b085f6471247bf859341e1e57cdca
	Library/metadata/fc/fcc75f4e3ffe34628b8fdca268bf9b72
	Library/metadata/fd/fd89309e31e27406f9c3a04c1e04843e
	Library/metadata/fd/fda4c7a3512d34f37aa397176e187625
	Library/metadata/fd/fdf7ead72b9db48c782ddb447c315d32
	Library/metadata/fe/fe20648c9ae504ae69aa5d968fd437d9
	Library/metadata/fe/feba1bba74143455487efcf93107b91a
	Library/metadata/ff/ffb5af09d0eaf46898e199d263caebac
	ProjectSettings/EditorBuildSettings.asset
Merge pull request #79 from ebbyw/Ebby

Ebby