Added some error handleing support
Merge branch 'master' of https://github.com/burke-software/django-report-scaffold

Conflicts:
	scaffold_report/static/scaffold_report/scaffold_report.js