Enabled system calendars to be passed in the calid argument.
Fixed issue with calid filter.
Merge branch 'master' into develop