changed calendar url to have the course included
changes made so that upcoming events displays properly
Merge branch 'master' of https://github.com/librecms/librecms