Fix divide by 0 error
Fix pattern matching error
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 pull request #109 from andig/aggregator_visibility

Fix divide by 0 error
Merge pull request #112 from andig/fix-property-pattern-matching

Fix pattern matching error
- Upgrade jQuery to 1.11
- Upgrade jQuery-UI to 1.10.4
- Use excanvas only for IE < 9
- Move css before js to load in parallel
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
Beautify entities table and number formatting
Merge pull request #119 from andig/upgrade-jquery

Upgrade jQuery to 1.11
Merge branch 'master' into dev