Merge branch 'master' into astrid
banner del footer
Merge branch 'astrid' of https://github.com/idaChile/capital into astrid

Conflicts:
	wp-content/themes/capital/footer.php
Merge branch 'astrid'