some bugs
Merge branch 'actividades' of https://github.com/pablomassa/dia-del-futuro into actividades
redisenio