Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 5 Jan 2017 12:24:37 +0000 (12:24 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 5 Jan 2017 12:24:37 +0000 (12:24 +0000)
commit67ba2560892f47d848754a97c7a809c7b8f8b3fb
treeddd62268ba83008af3b0146cad7ad0aae65d06fb
parent8b55eedb9d76a8c65b80f756c4412bf029906bf7
parent46f8b484bb166375423eab4387dca05b48a9a8ff
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability

Conflicts:
src/jalview/gui/PopupMenu.java
examples/appletParameters.html
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/APopupMenu.java
src/jalview/appletgui/AlignFrame.java
src/jalview/bin/JalviewLite.java
src/jalview/gui/PopupMenu.java