Merge pull request #165 from burke-software/8_19_temp_develop

8 19 temp develop
Revert "8 19 temp develop"
Merge pull request #166 from burke-software/revert-165-8_19_temp_develop

Revert "8 19 temp develop"
I'm removing this assertion for a couple of reasons...
A) This particular student is of "balt" type and should not touch cache fields, of which .gpa is one
and B) This type of test (checking student grades for the correct scaling) is well covered by several other tests
Nasty hack to deal with intermittent
com::sun::star::lang::DisposedException [13758936]
Merge pull request #170 from burke-software/jnm-libreoffice-hack

Nasty hack to deal with intermittent com::sun::star::lang::DisposedException [13758936]
Fixed urgent import errors
added import sys
Merge branch 'master' of github.com:burke-software/django-sis
removing one import sys
Fixed work study import
Merge branch 'master' of https://github.com/burke-software/django-sis
Fixed work_study import errors
Merge branch 'master' of https://github.com/burke-software/django-sis into develop

Conflicts:
	django_sis/settings.py
	requirements.txt
Fixed sentry 29514864