Merge branch 'master' into care-reports
Properly aggregate based on cbo/province
Merge branch 'care-reports' into staging2