Fixed settings basy.py
Merge branch 'users'