Fixed import errors
Merge branch 'develop' of https://github.com/burke-software/django-sis into develop