Merge pull request #47 from andig/master

Various middleware bug fixes and optimizations
Merge pull request #49 from andig/master

Fix vzlogger error on JSON POST introduced by last commit
Merge pull request #50 from andig/master

Fix JSONP exception handling and add CORS support
("Also fixed an artifact in AggregatorInterpreter")
New tool, CCALERT
Update
Update
Update 2
Autodetection of channel type
Update description
from __future__ import division
Merge pull request #51 from andig/master

Set VZ_VERSION to 0.3 to indicate availability of new features
more sensible names for electric energy channel types
capitalization
Merge pull request #52 from r00t-/rename-energy-meters-v1

more sensible names for electric energy channel types
fix fuckup in previous commit: in json, unlike php, a comma after the last array element is not allowed
Merge pull request #53 from r00t-/rename-energy-meters-v1

fix fuckup in previous commit: in json, unlike php, a comma after the la...
Merge pull request #54 from andig/master

Backed out changes from pr47 as COUNT(*) kills performance on large INNO...
Fix error with long aggregates (week/month)
Merge pull request #56 from thkaiser/master

Fix error with long aggregates (week/month) (add missing SORT to query)
Added unit tests