Add consumption and production merging

[pppfkp]

When you request both production and consumption data then it gets all data for production then all data for consumption. It would be better if it merged production and consumption data from the same hour. eg. from this {hour: 21:30 production: 1.2} {hour: 21:30 consumption: 1.3} to this {hour: 21:30 production: 1.2 consumption: 1.3}