merged
added datepicker gem
merged