CAL-342 fix calendar repetitive activity
merge with feature/activity-type