Merge branch 'master' of https://github.com/burke-software/django-sis into tenant
Merge branch 'develop' of https://github.com/burke-software/django-sis into tenant
Merge branch 'develop' of https://github.com/burke-software/django-sis into tenant
Basic multi tentant support
Celery is ready for multi tenant
Added multi tenant database engine for heroku conf
Merge branch 'develop' of https://github.com/burke-software/django-sis into tenant

Conflicts:
	django_sis/settings.py
	fig.yml
	requirements.txt
settings changes so site runs without multi tenant
Trying to make it possible to run with or without tentant on heroku
Fixed settings import
annoying heroku settings
dumb typo
Fixed 500 when no logo is available
Fixed celery to be able to run with or without multi tenant
Merge branch 'develop' of https://github.com/burke-software/django-sis into tenant

Conflicts:
	django_sis/settings.py
	requirements.txt
Merge branch 'tenant' of https://github.com/burke-software/django-sis into develop
Longer number field on benchmarks [close-14412991]
Screwing around with ldap app settings
adding try/excepts for attendance statuses
Merge pull request #185 from burke-software/temp_dev

adding try/excepts for attendance statuses