datepicker added
blah
fixed merge conflicts