Merge branch 'master' of https://github.com/eadpucv/giornata_wp

Conflicts:
	footer.php
footer de nuevo (conflicto)