Stashing calendar
Working year calendar view
rearranged calendars
Merge branch 'refs/heads/calendar'