open
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cubemeiro_Project/Assets/Assets-csharp.sln
	Cubemeiro_Project/Assets/Assets.sln
	Cubemeiro_Project/Assets/Library/CurrentLayout.dwlt
	Cubemeiro_Project/Assets/Library/assetDatabase3