Added NationalConsumptionQueries and Price queries
Merge branch 'master' of https://github.com/TueHald/PowerViz2