Update routes.rb
update users controller
Merge branch 'master' into routes
Merge branch 'routes' of https://github.com/diegobiavati/colchonet into routes