cleanup cvsu reports
Merge branch 'master' into unicef_cvsu_reports

Conflicts:
	settings.py