Fix spelling error in CalendarController.php
On branch 4.5, update extension so it is compatable with 4.5
Merge stuff. Solve conflict in README