Changed the Sql for getConsumptionUser().
Merge branch 'develop' of https://github.com/bregell/server into develop