actualizacion
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/base/default/template/catalogsearch/result.phtml