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

Conflicts:
	Swarch/Assembly-CSharp-vs.csproj
	Swarch/Assembly-CSharp.csproj
	Swarch/Library/ScriptAssemblies/Assembly-CSharp.dll
	Swarch/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Swarch/Library/assetDatabase3
	Swarch/Swarch-csharp.sln
	Swarch/Swarch.sln