Fix test_current_vs_older [12809534]
Added course sort option in Student Report [13694751]
Merge branch 'master' of https://github.com/burke-software/django-sis
Adding some backwards compatibility to templates [13717790]
New simple import version is required
Nothing to see here, move along.
Censoring word choices
Fix Sentry 26739072
Fixed broken admin search in course [close-13688827]
Merge branch 'master' of https://github.com/burke-software/django-sis
Fixed discipline showing students in faculty select
Fixed add multiple attendance not showing students
Updated procfile to show logs
Merge branch 'master' of https://github.com/burke-software/django-sis into develop

Conflicts:
	Procfile
	ecwsp/sis/autocomplete_light_registry.py
	ecwsp/sis/scaffold_reports.py
	requirements.txt