Merge branch 'master' into OPM-reports

Conflicts:
	custom/opm/opm_reports/reports.py
	custom/opm/opm_reports/templates/opm/report.html
Fixed tests
Merge branch 'OPM-reports' of github.com:lwyszomi/commcare-hq into opm
Merge remote-tracking branch 'origin/master' into opm