Merge branch 'develop' into features/JAL-2110_crossRefDuplications
authorJim Procter <jprocter@issues.jalview.org>
Wed, 13 Jul 2016 15:51:30 +0000 (16:51 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 13 Jul 2016 15:51:30 +0000 (16:51 +0100)

Trivial merge