foghorn
Merge remote-tracking branch 'origin/master'

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/ee/eeb9985892ac2444aa5a21efa3e1ee9b
	spacePaint-csharp.sln
	spacePaint.sln