remove settings.py from repo
add settings.py.example
Merge branches 'master' and 'admin-reports'