Cambios no contemplados
Merge branch 'master' of https://github.com/estrategasdigitales/cocoon
Merge branch 'master' of github.com:estrategasdigitales/cocoon into magento