UIT-13: Added header button to go to calendar.
Fix merge conflicts.