Se agrega login para operadores.
Merge branch 'master' of https://github.com/carloslfuentes/propymes

Conflicts:
	app/controllers/user_sessions_controller.rb
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/layouts/_header.html.haml
	config/locales/activerecord/en.yml
	config/locales/activerecord/es.yml