added calender to settings 2
merge