Merge branch 'master' into care-reports
Stop using SimpleColumn for indicator columns
Properly convert data that came from postgre
Merge branch 'care-reports' into staging2

Conflicts:
	custom/reports/care_sa/reports/sql.py