fix datepicker highlight bug
Merge branch 'dev' into build
build