Merge remote-tracking branch 'origin/develop' into
authorkiramt <k.mourao@dundee.ac.uk>
Fri, 5 May 2017 09:35:48 +0000 (10:35 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Fri, 5 May 2017 09:35:48 +0000 (10:35 +0100)
commite5b2edf3955c50cfd61799ad12cdc9016603ee1c
treed48f38e0a48f6b3411ba5568719703a4ed157b73
parentdf98ae3e601ff44c9a1d7beb5c9014aebf0e960e
parent7451c6419c9c94627f79d044228db55b90e9b4cf
Merge remote-tracking branch 'origin/develop' into
features/JAL-2388hiddencolumnschanges

Conflicts:
src/jalview/gui/AnnotationColumnChooser.java
src/jalview/io/AnnotationFile.java
src/jalview/appletgui/AlignViewport.java
src/jalview/appletgui/AnnotationColumnChooser.java
src/jalview/datamodel/Alignment.java
src/jalview/datamodel/AlignmentView.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AnnotationColumnChooser.java
src/jalview/io/AnnotationFile.java
src/jalview/io/JSONFile.java
src/jalview/viewmodel/AlignmentViewport.java
test/jalview/io/AnnotationFileIOTest.java
test/jalview/io/JSONFileTest.java