Merge commit

diff --cc .classpath
index 832b6d6,c3e70c0..c19e381
--- 1/.classpath
--- 2/.classpath
+++ b/.classpath
@@@ -56,9 -56,6 +56,10 @@@
        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Plugin.jar"/>
 +      <classpathentry kind="lib" path="lib/jersey-client-1.19.jar"/>
 +      <classpathentry kind="lib" path="lib/jersey-core-1.19.jar"/>
 +      <classpathentry kind="lib" path="lib/jersey-json-1.19.jar"/>
 +      <classpathentry kind="lib" path="lib/jsr311-api-1.1.1.jar"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin.jar"/>
        <classpathentry kind="output" path="classes"/>
  </classpath>

diff --cc resources/lang/Messages.properties
index 317f043,a797929..6054d98
--- 1/resources/lang/Messages.properties
--- 2/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@@ -1191,20 -1208,4 +1207,21 @@@ label.search_filter = Search Filte
  label.display_name = Display Label
  label.description = Description
  label.include_description= Include Description
 +action.back = Back
 +label.hide_insertions = Hide Insertions
 +label.mark_as_representative = Mark as representative
 +label.open_jabaws_web_page = Open JABAWS web page
 +label.opens_the_jabaws_server_homepage = Opens the JABAWS server's homepage in web browser
 +label.pdb_sequence_getcher = PDB Sequence Fetcher
 +label.result = result
 +label.results = results
 +label.structure_chooser = Structure Chooser
 +label.select = Select : 
 +label.invert = Invert 
 +label.select_pdb_file = Select PDB File
 +info.select_filter_option = Select Filter Option/Manual Entry
 +info.associate_wit_sequence = Associate with Sequence
 +label.search_result = Search Result
 +label.found_structures_summary = Found Structures Summary
- label.configure_displayed_columns = Configure Displayed Columns
++label.configure_displayed_columns = Configure Displayed Columns
+ label.start_jalview = Start Jalview

diff --cc src/jalview/gui/PopupMenu.java
Simple merge

diff --cc src/jalview/gui/SequenceFetcher.java
Simple merge

diff --cc src/jalview/jbgui/GPreferences.java
Simple merge

diff --cc src/jalview/util/Format.java
Simple merge

diff --cc src/jalview/util/MessageManager.java
Simple merge