Merge branch 'filtered' into ca-filtered
Merge branch 'filtered' into cvst-filtered
Merge branch 'filtered' into dfa-filtered
Merge branch 'filtered' into fct-filtered
Merge branch 'filtered' into sbf-filtered
Merge branch 'filtered' into wat-filtered
Merge branch 'filtered-paginate' into dfa-filtered
Merge branch 'master' into OPM-reports

Conflicts:
	custom/opm/opm_reports/reports.py
	custom/opm/opm_reports/templates/opm/report.html
Fixed tests
initial implementation of ExpendedMobileWorkerFilter
add optional aggregate data to pull fn; hookup SubmitHistory with new filter
add default option for all mobile workers and some bugfixes
text changes
remove duplicates from combined users
add username to users in filters
WIP for a fn to replace get_all_users_by_domain()
add ability to get demo_users as well
Add endpoint for Expanded Mobile Worker Filter
add basic options to EmwfOptions
sort users