Fixed up the calendar. Icon click works. Calendar dismisses when a date is chosen
Merge remote-tracking branch 'upstream/master'