not sure what is going on
Merge branch 'master' into skwak
set up logic to show all calendars