reduce sql selects
Merge branch 'DataAggregation' of github.com:dz1111/Maui-Smart-Grid into DataAggregation
correcting raw data reads