ticket:3 correction in settings.py
Merge branch 'master' into t4_enhancements
ticket:4 rework of tests
Merge branch 't4_enhancements'