Fix datetimepicker's bug
Merge branch 'develop'