sdf
Merge branch 'master' of https://github.com/jeiry/sw

Conflicts:
	sw/sw/Library/CurrentLayout.dwlt
	sw/sw/Library/ScriptAssemblies/Assembly-CSharp.dll
	sw/sw/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	sw/sw/Library/assetDatabase3
	sw/sw/Library/metadata/77/77c52c915fc33423c93f83a6f3eb03ca
	sw/sw/sw-csharp.sln
	sw/sw/sw.sln