Merge branch 'features/JAL-1152annotationSorting' of https://source.jalview.org/git...