added users views
Merge branch 'master' into edit-readme