Merge pull request #9 from bpatzke/master

Further work on the calendar API.
Merged changes from team master branch.
Fixed a typo in course_events() and a name conflict.
Fixed a typo in course_events() and a name conflict.