devise help env test
Merge branch 'master' of https://github.com/enaguero/sistema_talleres_salmoneras

* 'master' of https://github.com/enaguero/sistema_talleres_salmoneras:
  layout (puse un template :P) + finalizando base usuario
local migration
users_controller(almost) and users unit tests done
users controller test without redirect/render part (prbl with devise)
Merge branch 'master' of https://github.com/enaguero/sistema_talleres_salmoneras

* 'master' of https://github.com/enaguero/sistema_talleres_salmoneras:
  fotos de perfil por defecto mas bonitas, y se creo modelo de empresa

Conflicts:
	db/schema.rb
enterprise model spec added
db_spec syntax enhanced
local.enforcement = true in app.rb to shut down the warnings
pequeno arreglo a css
recuperar contrasena todos #12401557699635
merging
fixing test data
local migration
users_controller(almost) and users unit tests done
enterprise model spec added
pequeno arreglo a css
recuperar contrasena todos #12401557699635
fixing test data
gemfile uggly