Fix Consumption/Average calculation issues plus enhancements

Fixes http://demo.volkszaehler.org/pipermail/volkszaehler-dev/2013-July/002943.html