Merge branch 'develop' into documentation/JAL-2325_release2101
authorJim Procter <jprocter@issues.jalview.org>
Mon, 21 Nov 2016 15:40:08 +0000 (15:40 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 21 Nov 2016 15:40:08 +0000 (15:40 +0000)

Trivial merge