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

Conflicts:
	sw/sw/Assets/main.unity
	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/guidmapper
	sw/sw/sw-csharp.sln
	sw/sw/sw.sln
	sw/sw/sw.userprefs