Added maxLoad to client and server in the getTotalConsumption query
Merge branch 'master' of https://github.com/TueHald/PowerViz2