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

Conflicts:
	app/design/frontend/base/default/template/catalog/category/view.phtml
	app/design/frontend/textil1/textil/template/page/html/header.phtml
	var/cache/mage--1/mage---internal-metadatas---cda_Zend_LocaleC_es_MX_currencynumber_
	var/cache/mage--1/mage---internal-metadatas---cda_Zend_LocaleC_es_MX_currencysymbol_
	var/cache/mage--1/mage---internal-metadatas---cda_Zend_LocaleC_es_MX_nametocurrency_
	var/cache/mage--4/mage---internal-metadatas---cda_Zend_LocaleC_es_MX_currencysymbol_MXN
	var/cache/mage--4/mage---internal-metadatas---cda_Zend_LocaleC_es_MX_currencytoname_MXN
	var/cache/mage--4/mage---internal-metadatas---cda_Zend_LocaleC_es_MX_nametocurrency_MXN
	var/cache/mage--5/mage---internal-metadatas---cda_CORE_CACHE_OPTIONS
	var/cache/mage--5/mage---internal-metadatas---cda_Zend_LocaleC_es_MX_currencytoregion_MX
	var/cache/mage--b/mage---internal-metadatas---cda_Zend_LocaleL_es_MX_symbols_