add jquery ui date and rails time input
merge conflicts resolved