Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 17 Jan 2017 13:31:55 +0000 (13:31 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 17 Jan 2017 13:31:55 +0000 (13:31 +0000)
commitca0a70b02a67f842a195319414d241ffa336656b
tree13c87666d831f4eb85c4cfe1c1223d588bdd3454
parentdfd021096780038aa9389ed96f6ce938244f95c4
parentb71ca98d05f8848fa3170d606b7b8a8ef6d274f4
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability

Conflicts:
src/jalview/gui/PopupMenu.java
src/jalview/jbgui/GAlignFrame.java
src/jalview/appletgui/APopupMenu.java
src/jalview/appletgui/AlignFrame.java
src/jalview/bin/JalviewLite.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/PCAPanel.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/Preferences.java
src/jalview/jbgui/GAlignFrame.java