Merge branch 'develop' into features/JAL-2316
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 13 Dec 2016 11:10:05 +0000 (11:10 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 13 Dec 2016 11:10:05 +0000 (11:10 +0000)
commit0fcc08f1f633aa9eae854ebe0c78b5fb75471898
tree1d148562a8b919783d4ec6aa30218d975aaeebfe
parente390c310cb1391beba4b0238645120f772a99b98
parent2da3a29ae39b692964b85456353985d388aa3858
Merge branch 'develop' into features/JAL-2316

Conflicts (resolved):
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/gui/Preferences.java
help/html/webServices/urllinks.html
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/gui/DasSourceBrowser.java
src/jalview/gui/Desktop.java
src/jalview/gui/IdPanel.java
src/jalview/gui/Preferences.java
src/jalview/gui/WsPreferences.java
src/jalview/jbgui/GSequenceLink.java