Merge remote-tracking branch 'origin/master'

Conflicts:
	SandBox/Assets/Assets/Materials/LavaClose.mat
	SandBox/Assets/Assets/Materials/SeaClose.mat
	SandBox/Assets/Scenes/main.unity
	SandBox/SandBox-csharp.sln
	SandBox/SandBox.sln