jquery date picker
merged conflicts