Added missing field in a group query
Merge branch 'caselistmixin-refactor' into double-enter-both-groups

Conflicts:
	corehq/apps/reports/filters/users.py