[bug] refactorisacion de historias y sctividades
Merge branch 'master' of https://github.com/colectivovirtual/sitis