Update admin view controller
Merge branch 'master' of github.com:arandilopez/Toscana
Merge branch 'master' of github.com:arandilopez/Toscana
Merge branch 'master' of github.com:arandilopez/Toscana
Update UserController