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

Conflicts:
	wp-content/cache/qc-c-0a95d53fb493fcba49e7a11b9f21c426-53112bbe4a2706f57a154710d66d20be-f3bfeb3387c38d7a557be4d864d67f39
	wp-content/cache/qc-c-25cb806d1bbd6c7e68b1a8a0fbdc804a-630e2bc1b06a86b8646812fd0c20d84e-f3bfeb3387c38d7a557be4d864d67f39
	wp-content/cache/qc-c-2a4d385be5b8442b9a898b0a8c0eb4ff-026b3affff25ae79fe89705d2e318aac-f3bfeb3387c38d7a557be4d864d67f39
	wp-content/cache/qc-c-9cdf713dcc3b249bcc3d7c8e19590552-d6b6bbaa79d8db2afa4eae2f68940f0e-f3bfeb3387c38d7a557be4d864d67f39
	wp-content/cache/qc-c-9e9c36a871be3b4b286f7eb104ab073c-18da8f62771650f629bfc972c40de374-f3bfeb3387c38d7a557be4d864d67f39
	wp-content/cache/qc-c-c2326ca41e3ad607889603a0b651ab09-d75e8b973a7d2cae1859c4524250d387-f3bfeb3387c38d7a557be4d864d67f39
	wp-content/cache/qc-c-c749446a0446fb9c50981839a213137a-fc31f541716a722e6e557e51b66afdbf-f3bfeb3387c38d7a557be4d864d67f39