merge changes from upstream settings.py
Merge branch 'structured-settings'
make a spare favicon for insurance
switch favicon for local use