Sun level now calculated from market price data
Merge branch 'development' into rasmusPromise
Upgrade button now hidden if no upgrades are available