correct .css href on jquery ui stylesheet include
add jquery ui images
move images
rearrange dependencies
apply datepicker to paired elements too
fix merge conflict