Built the calendar cleanup, the assertion may be a bit wonky but clean up works
Merge branch 'master' into daily_recurance
[michael]Should have daily recurrence up and running
[michael] clean up on some lines of code]
[michael] Complete calendar cleanup and daily recrrence
Merge branch 'master' into daily_recurance