Bug fix when displaying events in the time line : some times, events of 2 different cycles were displayed at the same time
Merge remote-tracking branch 'origin/master'