datepicker is added
Merge commit '505c9a6c061e8332b1a53d2ba7ef013ab5db7236'