fixed datepicker css hover
fixed datepicker css hover
merge resolved conflicts