Sun level now calculated from market price data
Merge branch 'development' into rasmusPromise
Upgrade button now hidden if no upgrades are available
fixed error with totime / fromtime being NaN / undefined
Merge remote-tracking branch 'origin/MEtte' into development

Conflicts:
	js/controllers/statusController.js
moved all sun functionality to its own controller