Merge branch 'develop' into devAPI
Added getConsumption() in user to retrieve 24h of data, also changes in server
Merge branch 'develop' into devAPI
Started to revork the way to get consumption data

Signed-off-by: bregell <johan_bregell@hotmail.com>
Revorked the way to get consumption for User, PowerStrip and PsSokcet. Less flexible but faster and easier to use. The Consumption is now represented in Wh (WattHours).
Merge pull request #14 from Soetnowzen/devAPI

New getConsumption functions