From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 28 Nov 2016 17:31:30 +0000 (+0000)
Subject: Merge branch 'develop' into trialMerge
X-Git-Tag: Release_2_10_3b1~399
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=483e7163b1fb8d4bcb9393014816c944befce328;hp=483e7163b1fb8d4bcb9393014816c944befce328;p=jalview.git

Merge branch 'develop' into trialMerge

Conflicts:
	src/jalview/gui/CutAndPasteTransfer.java
	test/MCview/PDBfileTest.java
	test/jalview/analysis/AlignmentAnnotationUtilsTest.java
	test/jalview/analysis/DnaTest.java
	test/jalview/analysis/FinderTest.java
	test/jalview/analysis/scoremodels/FeatureScoreModelTest.java
	test/jalview/controller/AlignViewControllerTest.java
	test/jalview/datamodel/AlignmentTest.java
	test/jalview/ext/ensembl/EnsemblSeqProxyTest.java
	test/jalview/ext/jmol/JmolParserTest.java
	test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java
	test/jalview/ext/paradise/TestAnnotate3D.java
	test/jalview/io/gff/ExonerateHelperTest.java
	test/jalview/io/gff/GffTests.java
	test/jalview/structure/Mapping.java
	test/jalview/structure/StructureSelectionManagerTest.java
	test/jalview/structures/models/AAStructureBindingModelTest.java
	test/jalview/util/MappingUtilsTest.java
	test/jalview/ws/sifts/SiftsClientTest.java
---