Update model to use consistent Recurrence object#21

Samffy wants to merge 2 commits intomasterSamffy/recurrence:masterfrom

refactorSamffy/recurrence:refactorCopy head branch name to clipboard