Merge branch 'patch/JAL-2698_blockingAutoAssociateDiaog' into develop
authorJim Procter <jprocter@issues.jalview.org>
Tue, 29 Aug 2017 14:44:55 +0000 (15:44 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 29 Aug 2017 14:44:55 +0000 (15:44 +0100)

Trivial merge