Merge branch 'doc/JAL-2494_JAL-2828_mergefindAnnotation' into develop
authorJim Procter <jprocter@issues.jalview.org>
Fri, 17 Nov 2017 12:14:21 +0000 (12:14 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Fri, 17 Nov 2017 12:14:21 +0000 (12:14 +0000)

Trivial merge