Merge remote-tracking branch 'origin/master'

Conflicts:
	SecondProject/Library/CurrentLayout.dwlt
	SecondProject/Library/assetDatabase3
	SecondProject/SecondProject-csharp.sln
	SecondProject/SecondProject.sln