moar stuff
Merge branch 'master' of https://github.com/Limyc-/7-Day-RTS

Conflicts:
	Assets/Scripts/ControlPoint.cs
	Assets/Scripts/GameSetup.cs