Generic calendarview working

together with parentheticaluniverse
Merge branch 'master' into generic_calendar