Update
Merge branch 'master' of https://github.com/joester/ICS168Swarch

Conflicts:
	Swarch/Assets/Sockets.cs
	Swarch/Library/CurrentLayout.dwlt
	Swarch/Library/ScriptAssemblies/Assembly-CSharp.dll
	Swarch/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Swarch/Library/assetDatabase3
	Swarch/Library/metadata/84/8439ce356cbf8414a8f110cc23633a81
	SwarchServer/SwarchServer/obj/Debug/SwarchServer.exe