portada
faq sin probar
faq realizado
about terminado
about terminado
about terminado
retoques en about
Merge branch 'calendario'

Conflicts:
	themes/bootstrap/views/site/index.php
Minicambio