todos, follow ups, calendar extensive
removed cal_todo
Merge remote-tracking branch 'origin/master'