Fix NaN error
Merge pull request #141 from andig/auto-hide-costs

Fix NaN error
Add json export
Merge pull request #142 from andig/enhance-exports

Add json export
Add support for multiple y-axes and y-axis labels
Merge pull request #132 from andig/add-multi-axis

Add support for multiple y-axes
Fix issue introduced with b39d8f70
Merge pull request #143 from andig/fix-jshint2

Fix issue introduced with b39d8f70
Add test for editing entities
Fix legend background sizing
Merge pull request #146 from andig/test-properties

Add test for editing entities
Merge pull request #147 from andig/fix-legend

Fix legend background sizing
Add icon for valves
Merge pull request #148 from andig/add-icon

Add icon for valves
Merge branch 'master' into dev

Conflicts:
	htdocs/frontend/index.html
	htdocs/frontend/javascripts/options.js
	htdocs/frontend/javascripts/wui.js