estandarizando vistas de modulos
delete
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/users_controller.rb
	app/views/layouts/admin/_sidebar_links.html.haml
	app/views/users/index.html.haml
	config/locales/es.yml