ticket:1 returned settings.py
Merge branch 't1_nethen'