cambio
Merge branch 'ver2014' of https://github.com/estrategasdigitales/onisuzume into ver2014

Conflicts:
	wp-content/themes/placeres-woocommerce/woocommerce/content-single-product.phpss