Commit for sync?

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scripts/Land_Island.cs
	Cigam-csharp.sln
	Cigam.sln
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/metadata/30/3046ef9d7b5b14b58b2fa34017305299
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cigam.userprefs
	Library/CurrentLayout.dwlt
	Library/expandedItems