Merge branch 'Jalview-BH/JAL-3048_dialogs' into Jalview-BH/JAL-3026
authorJim Procter <jprocter@issues.jalview.org>
Thu, 28 Jun 2018 16:15:04 +0000 (17:15 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 28 Jun 2018 16:15:04 +0000 (17:15 +0100)

Trivial merge