Changed name of calendar controller to calendars
Merge branch 'fix-controller-name'