add more date picker
add conflict file
Merge pull request #2 from VoteyTy/test1

Test1