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

Conflicts:
	app/design/frontend/base/default/template/checkout/onepage.phtml