overlapping between consecutive events solved
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios