Scaffold report
Merge branch 'develop' of https://github.com/burke-software/django-sis into develop

Conflicts:
	ecwsp/sis/scaffold_reports.py