Download
Merge remote-tracking branch 'origin/master'

Conflicts:
	New Unity Project/Library/CurrentLayout.dwlt
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/expandedItems
	New Unity Project/Library/guidmapper
	New Unity Project/Library/metadata/18/18e67739067524d2fa2f98f17f05ace9
	New Unity Project/Library/metadata/f0/f0ea019219ba64c1bb2b077c2d5a0c21