Merge branch 'aggregate' of https://github.com/andig/volkszaehler.org into aggregate
Merge branch 'aggregate' of https://github.com/andig/volkszaehler.org into aggregate