Fixed jQuery.highlight
Merge branch 'categories'
Added forgotten files.