Somethings up o.o
Merge branch 'master' of https://github.com/neitrosha/EcoSea into Churi_dev

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assets/Standard Assets/Projectors/Sources/Materials/Shadow Material.mat
	Library/CurrentMaximizeLayout.dwlt
	Library/metadata/09/09f6d28a736351b4db48b2b065ed745b