Merging
Merge branch 'master' of https://github.com/thely/wtsscheduling
Committing only to merge
Merge branch 'master' of https://github.com/thely/wtsscheduling
Added filtering calendars by course or tutor