Define package conflicts with jQuery UI and is not really needed.
Merge branch 'master' into new-annotations-editor
Sort comments chronologically