working on the feedback from activiey-event (can change activity as well as the start-end times)
Merge remote-tracking branch 'origin/master'