Merge branch 'develop'
Merge branch 'Cajas-de-noticias' into develop
Merge branch 'develop'
StripTags en eventos
...
Primera version de Page's (Enunciados)
Correcciones page.php
Ajuste del spy scroll
Merge branch 'master' into Cajas-de-noticias