Picking up an object
Merge remote-tracking branch 'origin/master'

Conflicts:
	unity_project/Assembly-CSharp-firstpass-vs.csproj
	unity_project/Assembly-CSharp-firstpass.csproj
	unity_project/Assembly-CSharp-vs.csproj
	unity_project/Assembly-CSharp.csproj
	unity_project/Assembly-UnityScript-firstpass-vs.unityproj
	unity_project/Assembly-UnityScript-firstpass.unityproj
	unity_project/Assembly-UnityScript-vs.unityproj
	unity_project/Assembly-UnityScript.unityproj
	unity_project/Library/AssetServerCacheV3
	unity_project/Library/CurrentLayout.dwlt
	unity_project/Library/CurrentMaximizeLayout.dwlt
	unity_project/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll

	unity_project/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	unity_project/Library/ScriptAssemblies/Assembly-CSharp.dll
	unity_project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb

	unity_project/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll

	unity_project/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	unity_project/Library/ScriptAssemblies/Assembly-UnityScript.dll
	unity_project/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	unity_project/Library/ScriptMapper
	unity_project/Library/assetDatabase3
	unity_project/Library/expandedItems
	unity_project/Library/guidmapper
	unity_project/Library/metadata/00/00000000000000002000000000000000
	unity_project/Library/metadata/00/00000000000000003000000000000000
	unity_project/Library/metadata/00/00000000000000004000000000000000
	unity_project/Library/metadata/00/00000000000000004100000000000000
	unity_project/Library/metadata/00/00000000000000005000000000000000
	unity_project/Library/metadata/00/00000000000000005100000000000000
	unity_project/Library/metadata/00/00000000000000006000000000000000
	unity_project/Library/metadata/00/00000000000000006100000000000000
	unity_project/Library/metadata/00/00000000000000007000000000000000
	unity_project/Library/metadata/00/00000000000000008000000000000000
	unity_project/Library/metadata/00/00000000000000009000000000000000
	unity_project/Library/metadata/00/0000000000000000a000000000000000
	unity_project/Library/metadata/00/0000000000000000b000000000000000
	unity_project/Library/metadata/00/0000000000000000c000000000000000
	unity_project/Library/metadata/04/040f62278a5672c4a86660a5e56aa684
	unity_project/Library/metadata/04/04406870705e8864c94fb264007a52be
	unity_project/Library/metadata/04/044a6741ba3f18c499c32ff0bf490979
	unity_project/Library/metadata/04/04e0beb0b1be6d74c95c61528ef13404
	unity_project/Library/metadata/04/04ee617d9c0ef0946b7c69ca1255a94d
	unity_project/Library/metadata/05/054ebc31f77367e49a0caf88071c60cd
	unity_project/Library/metadata/08/081bb866b0f6ee149a25e6f5354ca4e7
	unity_project/Library/metadata/08/08514025b56466443b75eb5bd09696fb
	unity_project/Library/metadata/08/08f569adbab1a044da91c8d62c6b447f
	unity_project/Library/metadata/0b/0b9fe02575c5b02479ce175e9eca9fd9
	unity_project/Library/metadata/0d/0d998c3b3a3fece46b356ec831db6ae2
	unity_project/Library/metadata/0d/0dfd5c897b50f4c48bff8ee97a01cfef
	unity_project/Library/metadata/13/13c64989c40a1494a8909bc5237b02c5
	unity_project/Library/metadata/13/13dc74602b625d4479f30124e9f77f96
	unity_project/Library/metadata/16/1664f07eaacb20643a32f9237778203c
	unity_project/Library/metadata/18/188ad1266bea1e041afc924c4b3f3a9a
	unity_project/Library/metadata/1a/1a8430acd95ebbd40b9384ffc551147e
	unity_project/Library/metadata/22/22f59455dc4a7d24f931d87f6dc20878
	unity_project/Library/metadata/23/230d6819508b73841bce68acc4b8c428
	unity_project/Library/metadata/23/23ab400f578df3441b4be4951ae519d6
	unity_project/Library/metadata/24/24dc7a754b67d6d4d9dc77f00b845df5
	unity_project/Library/metadata/2a/2aa13bcd20c855d4099b2087e7452684
	unity_project/Library/metadata/2c/2c015aa8e7c98214b8520a120c029dda
	unity_project/Library/metadata/31/31b6e98cf23a7224abf72c576aabd06f
	unity_project/Library/metadata/32/32a58c89e5a696547b37a21c701cbd03
	unity_project/Library/metadata/33/3345a33c999910e46a30705f6c0f41b2
	unity_project/Library/metadata/33/33a4bb832c3d3114db409ed769b825bd
	unity_project/Library/metadata/34/34735559f5cdfcf4588efc4bb635781c
	unity_project/Library/metadata/38/384f8fe3331ea714380c3dc42dd5a0eb
	unity_project/Library/metadata/3a/3ade818836b38f64c9336ff1e31cdd74
	unity_project/Library/metadata/3d/3da205b614b4f2d4b981bc3bbdce7ee2
	unity_project/Library/metadata/45/4571dd0b70bb09e4f99a950f1e437ba6
	unity_project/Library/metadata/4b/4b323450bf64e01429f33b5102072160
	unity_project/Library/metadata/4c/4c5377355f944a342b645539845332c2
	unity_project/Library/metadata/4d/4dd0a0710b270914cb54165b95381e17
	unity_project/Library/metadata/54/54216e9ed42974e30967824b7f0b2806
	unity_project/Library/metadata/59/59f6d376dbc52184e9e6becf199e4d7a
	unity_project/Library/metadata/5a/5ad9e368d6244944f9d6180c40ff33ab
	unity_project/Library/metadata/5b/5b5b3c3cb9a829d49bcd0cba181d45f3
	unity_project/Library/metadata/5c/5c1eb87eb73151f4ab665c946965c678
	unity_project/Library/metadata/5d/5d1dda4f8b0b42040a8676daa2da395c
	unity_project/Library/metadata/5d/5d257eb356a7dcf48a74f4c7cc87b611
	unity_project/Library/metadata/5f/5fdacb9aeb60d2e43aab46a89c2dd89d
	unity_project/Library/metadata/69/69dbd4fada616c044a08ee20358e3a15
	unity_project/Library/metadata/6a/6a691cffe5ff97549977b3c6a9c546f5
	unity_project/Library/metadata/6f/6f83d4a37f626a745be0973702c824be
	unity_project/Library/metadata/75/75247d6da1aa3dd429ec1dab0b621b44
	unity_project/Library/metadata/75/75bc2c991aec8ed45aadd4201deba7ac
	unity_project/Library/metadata/75/75f2c95bad2d92745be0a2fd258b68dd
	unity_project/Library/metadata/78/783989e2b39247b4083a2f33f1ee064f
	unity_project/Library/metadata/78/786768f8984211042b8b74555ec3e58d
	unity_project/Library/metadata/7a/7a1d3e8679b3941449e1115a102f0643
	unity_project/Library/metadata/7a/7a87a0edb6df1df42b2ec45aa839491d
	unity_project/Library/metadata/7b/7b8332b536ae828488c026d58c457bbd
	unity_project/Library/metadata/7d/7d17e8663af3f6e43bc791c8364f751d
	unity_project/Library/metadata/7d/7deb7d1071f57be418861ec25390ce75
	unity_project/Library/metadata/7e/7e08206f57b2f1d40a9591b480d4aa38
	unity_project/Library/metadata/7e/7e0b0a994d8934541a387e092630b5db
	unity_project/Library/metadata/7f/7f0ad18134de4e64295cabc0fbfeb91f
	unity_project/Library/metadata/80/80259af510cc771459f9f5bb92976da8
	unity_project/Library/metadata/83/831e061a12a113d4ea16ab4f26d7cc46
	unity_project/Library/metadata/83/83ad9c23e538aef4b9a6b97b1204f111
	unity_project/Library/metadata/88/88e29fdea7cf1bc429732a936b79bd42
	unity_project/Library/metadata/8b/8b207fe3d3baa8044b304b5b363be8c1
	unity_project/Library/metadata/8b/8b7e767bdc5b79246bf01e41b9c30163
	unity_project/Library/metadata/8c/8c56207879dbe7d42b5f1bd6388ffdcc
	unity_project/Library/metadata/8d/8d8c9c0a8e711b04287b717b4500304c
	unity_project/Library/metadata/8f/8f61ae060bf7ae64f9c9802be6463005
	unity_project/Library/metadata/8f/8f62d7482760eae448d5b3bf788dbf83
	unity_project/Library/metadata/90/900a45e7a637c624fb93c200f84d79ee
	unity_project/Library/metadata/90/9018bf283ee990f439a7451e644e3fd1
	unity_project/Library/metadata/90/9026b4f8a9e6aa74888f8bdcaaac508e
	unity_project/Library/metadata/90/9094f84f63b95e9408fb95eb7d7fb5d8
	unity_project/Library/metadata/91/915d0fb7117d22d42a7ef130c35bef76
	unity_project/Library/metadata/91/917e366714da8754db6a5cb6f2b95a41
	unity_project/Library/metadata/91/91ae3d1c347ba8d488993b4e97efd47b
	unity_project/Library/metadata/93/934d97c097619ea46a8808be235f3ec6
	unity_project/Library/metadata/95/95dddccd8c368aa43a1802496393d978
	unity_project/Library/metadata/9d/9d878ca31d198e74f8cfabdadc20d07b
	unity_project/Library/metadata/9e/9e643bff1715a8445b3c68870f8e63fc
	unity_project/Library/metadata/a0/a072b3b5e7818174ab2560448e4e0425
	unity_project/Library/metadata/a3/a37459fefb27dca49931e7f7458f0cf5
	unity_project/Library/metadata/a3/a3f04f38da6ff8b43a0c2221add73726
	unity_project/Library/metadata/a7/a73cf0fea40ec294886757ad2ae15663
	unity_project/Library/metadata/aa/aa72606820ef58e45aeef5ba3dd9939e
	unity_project/Library/metadata/aa/aaa2e221abe85e8408cc85f283baff6f
	unity_project/Library/metadata/ad/ad357977bb4ada44da93d29634de5582
	unity_project/Library/metadata/b1/b14e29c1ff666ce4fa5b5625f3189b97
	unity_project/Library/metadata/b2/b26562381dffc2043ae2593eb22c3305
	unity_project/Library/metadata/b3/b365e6042890d4b1987423ed6bb8a08c
	unity_project/Library/metadata/b6/b6074ed80bd71a940ae1c9e6092590d8
	unity_project/Library/metadata/bd/bd4c9149f84f4734b9d54ed081442f8d
	unity_project/Library/metadata/bd/bd5c6fcbfded5bd468b8371b30d02124
	unity_project/Library/metadata/be/be95c8f41ce81214591da93802d13667
	unity_project/Library/metadata/c4/c4cb076a555a79840b22663d2ce1d97e
	unity_project/Library/metadata/c5/c55d37938bb7ad741915563a775ad871
	unity_project/Library/metadata/c6/c67c7f9b6a8ba5048a46634e36461de2
	unity_project/Library/metadata/c8/c81df2918c80c054ca3d436e62090893
	unity_project/Library/metadata/cc/cc9c94001cef9f74088af924c74a9806
	unity_project/Library/metadata/ce/ce1dfc4737d05a44cb742207295fad83
	unity_project/Library/metadata/cf/cfc32670fc7f5804c9da62138322e666
	unity_project/Library/metadata/d0/d0861c412975bc648874e69739696936
	unity_project/Library/metadata/d1/d15e9359e17e22040af3517335c4dc64
	unity_project/Library/metadata/d4/d4c3f7befb2c79d45a530fb98646d167
	unity_project/Library/metadata/d6/d612271ffb5433443a6fb4f4cfaf8b4d
	unity_project/Library/metadata/d6/d66121b262cea74499aaf8d643e558f2
	unity_project/Library/metadata/d6/d6f34ff0691f1364e9bbb10a11aa66e8
	unity_project/Library/metadata/db/dba92d0061d8daa439bb010e26bfb26e
	unity_project/Library/metadata/db/dbd5d7982a5925341896460b43c9ab65
	unity_project/Library/metadata/dc/dc628feb73ff70e4086f19892ffe5205
	unity_project/Library/metadata/dd/dd71316309a0e0247b56c1f1fa8486c0
	unity_project/Library/metadata/df/df13971bfafa7e84c8c8a7deeee0b134
	unity_project/Library/metadata/e0/e0865d4ced5b86541ba244728c6fe397
	unity_project/Library/metadata/e3/e3206b0cfebc2964eb0675a7b5f0e463
	unity_project/Library/metadata/e4/e44814106df6dc1458f2e1fb1bca40c8
	unity_project/Library/metadata/e5/e53c8c3dcc4ff59438bc9e86cb45c3f6
	unity_project/Library/metadata/e6/e6a48ae02ab2dc5409264c55c96d2374
	unity_project/Library/metadata/e8/e88f1347a71247b4a9a254167f94bbc5
	unity_project/Library/metadata/e8/e896d3a3309776f42ad2c0aea1976f3f
	unity_project/Library/metadata/ea/ea36a628f492fa049a0878b6150ec4b1
	unity_project/Library/metadata/eb/eb22397ceede0e545a17cd30c6af0a76
	unity_project/Library/metadata/eb/eb88faf1842319c40bff39a230f488f7
	unity_project/Library/metadata/eb/ebcf349bad2c39548a5962960f8707de
	unity_project/Library/metadata/ec/ec898ac851587bc4d80daefc13815def
	unity_project/Library/metadata/ee/ee7efb547686b3040939dea62c519e05
	unity_project/Library/metadata/ee/eec03d7d67030c14b965839da1eabe16
	unity_project/Library/metadata/f2/f2bf49c809927d842812a47b05c484fd
	unity_project/Library/metadata/f3/f3823b38452a8c640a804161e314ea2f
	unity_project/Library/metadata/f7/f781c091d1c8647c380d5230adfaee54
	unity_project/Library/metadata/f7/f7cf4b28554fc87408383cbf5b1f8b72
	unity_project/Library/metadata/f9/f9f4ae8f4ce045641bad5450947308a7
	unity_project/Library/metadata/fd/fd753357e8801644cb5ee63cf0037602
	unity_project/Library/shadercompiler-1.log
	unity_project/unity_project-csharp.sln
	unity_project/unity_project.sln