UnitSelector coming up.

Doesn't do anything yet. Stay tuned.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Machines/Prefabs/EcoMachine.prefab
	Assets/Machines/Prefabs/HotTempMachine.prefab