Added calendar
Calendar merge conflicts fixed