task, calendar_event - pull recurring bit out as conditional and added note about stakeholder
Merge branch 'master' into production