fix selector
add today
resolve conflict
Merge branch 'yodatepicker'