[CAL-168]  Fix so that calendars showed up more than once if the set of user roles contained more than 1 element from the set of calendar default roles.
Merge pull request #31 from jhelmer-unicon/CAP-168_duplicate_calendars

[CAL-168]  Fix so that calendars showed up more than once if the set of ...