modifiction of Game.Go
merge
Merge remote-tracking branch 'origin/tech_tree' into release

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Prefabs/Resources/Building-armored.prefab
	Assets/Prefabs/Resources/Building-veteran.prefab
	Assets/Scripts/Game.cs
	Library/AssetImportState
	Library/EditorUserBuildSettings.asset
	Library/InspectorExpandedItems.asset
	ProjectSettings/EditorBuildSettings.asset
merge
merge