Added user model and default views
Merged with master