Remove model spin up check for settings in the database, which won't exist during model migration
Add httpproxy as a required Django module
Reorder installed apps to fullfil expected django_content_type ordering in fixtures
Merge conflicts resolved
Fix casting failure for backing model to Feature Template lookup
Merge branch 'develop' of https://github.com/ngageoint/geoq into develop
Merge branch 'develop' of https://github.com/ngageoint/geoq into develop
Merge branch 'develop' of https://github.com/ngageoint/geoq into develop
Merge branch 'develop' of https://github.com/ngageoint/geoq into develop
Check that we aren't inside a sync or migrate before trying to pull settings out of the DB
Updated initial data to match current model state
Merge conflict in requirements.txt resolved