Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 22 May 2017 14:16:40 +0000 (15:16 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 22 May 2017 14:16:40 +0000 (15:16 +0100)
commit691e7f3e04f4ddc3ae858257f063a0b01be265fc
tree9a08816d58763f033fb61a4b312d813855d47a3f
parente4fe46502d641a228ee4877d2a5a8443eb75f189
parentaef3d5fa8e246dd69593b67de48e4f9de1699022
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
src/jalview/analysis/AlignmentSorter.java
src/jalview/appletgui/FeatureSettings.java
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/FeatureRenderer.java
src/jalview/gui/FeatureSettings.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
test/jalview/analysis/AlignmentSorterTest.java
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/FeatureSettings.java
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/CutAndPasteTransfer.java
src/jalview/gui/FeatureRenderer.java
src/jalview/gui/FeatureSettings.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java