Fix multiples more on a day
Merge branch 'calendar' into develop
merged with calendar