CAL-187 fix contextual menu for calendar and events
CAL-187 merge with relooking
CAL-187-merge again with new commits