added user and settings models and view
Merge branch 'add-settings'