download
Merge remote-tracking branch 'origin/master'

Conflicts:
	New Unity Project/Library/CurrentLayout.dwlt
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/expandedItems
	New Unity Project/Library/guidmapper
	New Unity Project/Library/metadata/00/002a3ebcce52c4efd9ef0afa5b372fe9
	New Unity Project/Library/metadata/1e/1ee39c3b0833e41cb8eaf38c37ff1e2b
	New Unity Project/Library/metadata/68/684db29a13e5641ffb06d5ed3fb187ca
	New Unity Project/Library/metadata/6f/6f27f6574a9e64e98816f5682755fab2
	New Unity Project/Library/metadata/70/7035db63fd4e54a9ab5fc604bfbfd5e1
	New Unity Project/Library/metadata/7f/7f9b6a64cce3c4c1db46796a0dde333b
	New Unity Project/Library/metadata/81/81cb456b04527114a8931de029d3dabc
	New Unity Project/Library/metadata/8e/8e6adbf20a0554125b511ed4a81d8dbe
	New Unity Project/Library/metadata/91/9115887b973a949078f6269296abe0fe
	New Unity Project/Library/metadata/93/935a9fe90c1774b5096ca4e45298e3d5
	New Unity Project/Library/metadata/97/97e11130a3c034453bb9d2c772050e61
	New Unity Project/Library/metadata/a7/a7ee767dfb799497d8e689aa88cedd85
	New Unity Project/Library/metadata/b2/b291564450f9646359119b136b9025c6
	New Unity Project/Library/metadata/ca/caece1af646904deca08e10b8dffc0ec
	New Unity Project/Library/metadata/cc/ccd3e8cab3d96449db98b536975b212a
	New Unity Project/Library/metadata/d6/d6313a9b40144463bbfa29fd4706baa9
	New Unity Project/Library/metadata/d8/d8a91df48425c482584fdc608cc9de24
	New Unity Project/Library/metadata/f1/f153bd013405cc14bab9717d42873e14