activity realtime: primer intento cutre
Merge branch 'develop' of git.alabs.es:oiga.me into develop
activity realtime: segundo intento
Merge branch 'develop' of git.alabs.es:oiga.me into develop
Merge branch 'develop' of git.alabs.es:oiga.me into develop