Really add date picker file. Also save date to model.
Merge remote-tracking branch 'upstream/master'