fixed settings.py from git merge
fixed settings
fixed settings
encode emu formating in utf-8