Merge branch 'develop' into documentation/JAL-2325_release2101
authorJim Procter <jprocter@issues.jalview.org>
Tue, 22 Nov 2016 17:07:36 +0000 (17:07 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 22 Nov 2016 17:07:36 +0000 (17:07 +0000)

Trivial merge