Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Data/Data-csharp.sln
	Data/Data.sln
	Data/Library/CurrentLayout.dwlt
	Data/Library/assetDatabase3
	Data/Library/metadata/ff/ff7339b4df7f5d3468622e663e5cb978