resolución de conflictos, agregar devise
Merge branch 'master' of https://github.com/lgandras/ci5644-abr-jul-2013