UI changes
Merge branch 'master' of https://github.com/nkornek/Spaceship

Conflicts:
	SpaceShip/Assets/Scripts/Resource_alloc_country.cs