Allow user to override axis scale
Merge pull request #152 from andig/fix-axis-scale

Allow user to override axis scale
Ensure utf8 encoding independent from apache setup
Merge pull request #153 from andig/fix-umlaut

Ensure utf8 encoding independent from apache setup
Add support for data series with gaps
Misc...
Merge pull request #154 from andig/add-flot-gaps

Add support for data series with gaps
Merge branch 'master' into dev-squashed

Conflicts:
	htdocs/frontend/javascripts/wui.js
	lib/Volkszaehler/Definition/PropertyDefinition.json