Merge remote-tracking branch 'origin/releases/Release_2_10_4_Branch' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 28 May 2018 08:19:40 +0000 (09:19 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 28 May 2018 08:19:40 +0000 (09:19 +0100)
commit252ddd218b716396b003b3fcbe0f8da499bde8c8
treea753da51ffcbe2a569a2c1b6c8a868967c85849c
parentd716c9b072f989bef39c6eba038f779ce98396a8
parent41bb6b94cc3cba97055e0ec02ac42c52f1483700
Merge remote-tracking branch 'origin/releases/Release_2_10_4_Branch' into develop

Conflicts:
src/jalview/io/FeaturesFile.java
build.xml
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/gui/AlignFrame.java
src/jalview/gui/Desktop.java
src/jalview/io/FeaturesFile.java
test/jalview/gui/SeqCanvasTest.java
test/jalview/renderer/seqfeatures/FeatureRendererTest.java