fixed main.py to use correct settings files
Merge branch 'develop'