Sun level now calculated from market price data
fixed error
fixed
fixed the car again!!! + more pay per week
removed log
changed word in dic
removed unused table + controller
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/development' into protoBranch

Conflicts:
	js/controllers/applianceTableController.js