good magic
Merge branch 'master' of https://github.com/Zalastra/AbundantSpace

Conflicts:
	src/Manager/UIManager.cs
	src/UI/PlanetContextMenu.cs