Merge branch 'hotfix/JAL-1521' into Release_2_8_2_Branch

Conflicts:
	.classpath
	RELEASE
	src/castor.properties

diff --cc .classpath
index a7270ff,21bbab7..bd96609
--- 1/.classpath
--- 2/.classpath
+++ b/.classpath
@@@ -43,14 -43,13 +42,15 @@@
        <classpathentry kind="lib" path="lib/jdas-1.0.4.jar"/>
        <classpathentry kind="lib" path="lib/spring-core-3.0.5.RELEASE.jar"/>
        <classpathentry kind="lib" path="lib/spring-web-3.0.5.RELEASE.jar"/>
 -      <classpathentry kind="lib" path="lib/VARNAv3-9-dev.jar"/>
        <classpathentry kind="lib" path="lib/groovy-all-1.8.2.jar"/>
        <classpathentry kind="lib" path="lib/min-jabaws-client-2.1.0.jar" sourcepath="/clustengine"/>
-       <classpathentry kind="lib" path="lib/VARNAv3-9.jar" sourcepath="/Users/jimp/Documents/Jalview/VARNA/VARNAv3-9-src.jar"/>
 -      <classpathentry kind="lib" path="lib/resolver.jar"/>
 -      <classpathentry kind="lib" path="lib/serializer.jar"/>
 +      <classpathentry kind="lib" path="lib/json_simple-1.1.jar" sourcepath="/Users/jimp/Downloads/json_simple-1.1-all.zip"/>
 +      <classpathentry kind="lib" path="lib/slf4j-api-1.7.7.jar"/>
 +      <classpathentry kind="lib" path="lib/log4j-to-slf4j-2.0-rc2.jar"/>
 +      <classpathentry kind="lib" path="lib/slf4j-log4j12-1.7.7.jar"/>
 +      <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin.jar"/>
+       <classpathentry kind="lib" path="lib/xml-apis.jar"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin17"/>
        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
        <classpathentry kind="output" path="classes"/>
  </classpath>

diff --cc RELEASE
index 64bbd09,2b1603c..11598ab
--- 1/RELEASE
--- 2/RELEASE
+++ b/RELEASE
@@@ -1,2 -1,2 +1,2 @@@
- jalview.release=Release_2_8_2_Branch\r
- jalview.version=2.8.2\r
 -jalview.release=Release_2_8_1_Branch\r
 -jalview.version=2.8.1b1\r
++jalview.release=Release_2_8_2_Branch
++jalview.version=2.8.2

diff --cc src/castor.properties
Simple merge