Changing validation, moving from controller to model
Merge branch 'calendar-activities' of https://github.com/dac-os/calendar into calendar-activities