Merge remote-tracking branch 'origin/master'

Conflicts:
	Data/Data-csharp.sln
	Data/Data.sln
	Data/Data.userprefs
	Data/Library/CurrentLayout.dwlt
	Data/Library/InspectorExpandedItems.asset
	Data/Library/assetDatabase3
	Data/Library/expandedItems
	Data/Library/guidmapper