Download
Merge remote-tracking branch 'origin/master'

Conflicts:
	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/guidmapper
	New Unity Project/Library/metadata/12/128fcb35323024c648b4f479a34ea0eb
	New Unity Project/Library/metadata/43/436aa16d866444bdaacaa16ad97c43e9
	New Unity Project/Library/metadata/45/451df77a12535407fa117e5b01fb9a49
	New Unity Project/Library/metadata/47/478ae4d44ba1b4a3f9e08821086dd1fc
	New Unity Project/Library/metadata/4b/4ba4a34dcdc274348a062f7dfb10838f
	New Unity Project/Library/metadata/69/69fba53b6b72f4ec687aec96e22c05f3
	New Unity Project/Library/metadata/91/910f81e779e2b474397797ea84163f5f