Trying to update the infrastructure UI upon upgrade selection
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	core/src/se300/destinytactics/game/orbitalbodies/OrbitalBody.java