Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 19 Aug 2016 14:13:10 +0000 (15:13 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 19 Aug 2016 14:13:10 +0000 (15:13 +0100)

Trivial merge