Merge branch 'develop' into features/JAL-1793VCF; lambda Function for
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 24 Oct 2017 12:45:15 +0000 (13:45 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 24 Oct 2017 12:45:15 +0000 (13:45 +0100)
commit8d3aefef72e993e55c0f6b5c26e3979ae7269e0f
treed0967bafc7294c995e6aeb4deacad0565e46532c
parent62d2ee96fc3876b3773e786596bc5bf3ed2388df
parentc2ec295699b0e198ae1981bd3807394060f5c6d6
Merge branch 'develop' into features/JAL-1793VCF; lambda Function for
EnsemblLookup parsing

Conflicts:
src/jalview/ext/ensembl/EnsemblInfo.java
src/jalview/ext/ensembl/EnsemblLookup.java
src/jalview/ext/ensembl/EnsemblRestClient.java
src/jalview/datamodel/Sequence.java
src/jalview/ext/ensembl/EnsemblGene.java
src/jalview/ext/ensembl/EnsemblLookup.java
src/jalview/ext/ensembl/EnsemblRestClient.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/IdPanel.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/SeqPanel.java
test/jalview/gui/SeqCanvasTest.java