Preparando el despliegue.
Hecho un bundle install --without production
Merge branch 'master' into dev