sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game/Assembly-CSharp-vs.csproj
	Game/Assembly-CSharp.csproj
	Game/Game-csharp.sln
	Game/Game.sln
	Game/Game.userprefs
	Game/Library/CurrentLayout.dwlt
	Game/Library/ScriptAssemblies/Assembly-CSharp.dll
	Game/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Game/Library/assetDatabase3
	Game/Library/expandedItems
	Game/Library/guidmapper
	Game/Library/metadata/b2/b2fa6595308ff61458e46088fbdaf391