Merge branches 'master' and 'admin-reports'
Delete settings.py
Merge branches 'admin-reports' and 'master' into admin-reports