CAL-143 update summary, description, location, priority
Merge remote-tracking branch 'origin/feature/activity-type' into feature/activity-type