Updated gui scaling/unit actions
Merge branch 'master' of https://github.com/jannickj/cruel-nemesis

Conflicts:
	UnityTestGame/Assembly-CSharp.csproj
	UnityTestGame/UnityTestGame.sln