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

Conflicts:
	app/design/frontend/textil1/textil/template/page/html/header.phtml