Put jQuery-UI and jQuery.cookie into local jQuery
Merge remote-tracking branch 'origin/master' into gh-pages