Merge branch 'develop' into task/JAL-2196pdbeProperties
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 5 Oct 2016 15:17:59 +0000 (16:17 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 5 Oct 2016 15:17:59 +0000 (16:17 +0100)
commite838644df5d5a10a16cf0ad7fb23d24dd7d2729a
tree7e03c51055e0f43bf6bcb3cb72561ca0d4c3854f
parent6c96743ff6c65895e4b96523d0e3d05f6dc3cb01
parent5326cbb4462396e84cdbbc178040f42b436c9146
Merge branch 'develop' into task/JAL-2196pdbeProperties

Conflicts:
src/jalview/datamodel/PDBEntry.java
test/jalview/ws/dbsources/UniprotTest.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AppletJmol.java
src/jalview/datamodel/PDBEntry.java
src/jalview/gui/Jalview2XML.java
src/jalview/io/StructureFile.java
src/jalview/util/DBRefUtils.java
src/jalview/ws/dbsources/Uniprot.java
test/jalview/datamodel/PDBEntryTest.java
test/jalview/ws/dbsources/UniprotTest.java