updated date time picker
fixed tests
Merge branch 'origin/dev'