added CalendarOverviewFragment
fixed merge conflicts