Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 4 Nov 2016 15:34:11 +0000 (15:34 +0000)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 4 Nov 2016 15:34:11 +0000 (15:34 +0000)

Trivial merge