Update2
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game/Assembly-CSharp-vs.csproj
	Game/Assembly-CSharp.csproj
	Game/Assets/maingame.unity
	Game/Game-csharp.sln
	Game/Game.sln
	Game/Game.userprefs