hide datepicker after clicking
datepicker bug fixed
Merge remote-tracking branch 'upstream/master' into new_import