actualizacion
Merge branch 'magento' of github.com:estrategasdigitales/cocoon into magento

Conflicts:
	app/design/adminhtml/default/default/template/easybanner/grid.phtml