subiendo últimos cambios en local
Merge branch 'ver2014' of https://github.com/estrategasdigitales/onisuzume into ver2014

Conflicts:
	wp-content/themes/placeres-woocommerce/css/estilos.css
	wp-content/themes/placeres-woocommerce/header.php