Fix frontend display of consumption where base unit is any hourly flow (/h)
Fix cost display
Fix cost display for non-Watt units to omit kilo prefix
Merge branch 'fix-consumption-display' of https://github.com/andig/volkszaehler.org into andig-fix-consumption-display

Conflicts:
	htdocs/frontend/javascripts/entity.js
	htdocs/frontend/javascripts/wui.js