Controle de user correto adicionado a corporate
Merge branch 'master' of https://github.com/LACIS-TI/ERA-RAILS

Conflicts:
	app/controllers/adm/users_controller.rb
	app/views/adm/users/edit.html.erb
	app/views/adm/users/index.html.erb