subida de instalación magento
Merge branch 'magento' of https://github.com/estrategasdigitales/cocoon into magento

Conflicts:
	shop/skin/frontend/default/default/images/media/furniture_callout_spot.jpg
Merge branch 'magento' of https://github.com/estrategasdigitales/cocoon into magento