Merge branch 'master' into ils-reports

Conflicts:
	custom/ilsgateway/__init__.py
	custom/ilsgateway/tanzania/reports/dashboard_report.py
	custom/ilsgateway/tasks.py