New file with user view
Merge branch 'eduardo' into Users