fixed datepicker bug
Merge branch 'fix_datepicker'