Merge branch 'develop' into features/mchmmer
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 28 May 2018 08:56:14 +0000 (09:56 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 28 May 2018 08:56:14 +0000 (09:56 +0100)
commitf37c3fd4fe12799de498de5f397252e9f457fee9
tree63b9d4c0bc01a64613e554c648cbb8b0aec0fc70
parentccebd462f3616f4c08cda443d246c0c7c0d54e00
parent86b84a537a05d03a21ba115bffe3575cedf98be0
Merge branch 'develop' into features/mchmmer

Conflicts:
src/jalview/bin/Jalview.java
help/help.jhm
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/bin/Jalview.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/Desktop.java
src/jalview/io/AlignFile.java
src/jalview/jbgui/GPreferences.java