Added initial user model and views
Merge branch 'work'