Users controller updated for views
Merge branch 'ProfilePage'