test refactor: create_and_login_user method added
Merge branch 'master' of https://github.com/enaguero/sistema_talleres_salmoneras

* 'master' of https://github.com/enaguero/sistema_talleres_salmoneras:
  fixing tests
  conflicts
  gemfile uggly
  fixing test data
  recuperar contrasena todos #12401557699635
  pequeno arreglo a css
  enterprise model spec added
  users_controller(almost) and users unit tests done
  local migration
  fixing test data
  recuperar contrasena todos #12401557699635
  pequeno arreglo a css

Conflicts:
	spec/controllers/users_controller_spec.rb
test refactor: create_and_login_user method added