Merge branch 'master' of https://github.com/jahir/volkszaehler.org
Merge remote branch 'volkszaehler/master'
Merge branch 'master' of git://github.com/volkszaehler/volkszaehler.org
Fix JSON (Comments are not allowed in JSON files)
VZCompress2
Bad example... missing ,
Bugfix: UPDATE may cause duplicate timestamps
Fix #3: Last compressscheme always shows "no datapoints"
Merge branch 'master' of git://github.com/volkszaehler/volkszaehler.org into vzcompress2

Conflicts:
	lib/Definition/EntityDefinition.json
Caching
Fix possible div0 when cache leaves nothing to be processed
Delay between requests
Added timestamp to output, idea bgewehr #5 #6
Merge pull request #46 from adlerweb/vzcompress2

Vzcompress2