Mirroring John's fix with the new autocomplete scheme [13668771]
Merge branch 'master' of https://github.com/burke-software/django-sis into develop
Fixed migration dependency issue
Merge branch 'develop' of github.com:burke-software/django-sis into attendance_reports