Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of

https://source.jalview.org/git/jalview.git into
Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
	swingjs/SwingJS-site.zip
	swingjs/timestamp
	swingjs/ver/3.2.4/SwingJS-site.zip
	swingjs/ver/3.2.4/timestamp

diff --cc swingjs/SwingJS-site.zip
index 7774a16,c29d77b..e69de29
Binary files differ

diff --cc swingjs/timestamp
index 38bba3f,75fd0a4..5bd0bac
--- 1/swingjs/timestamp
--- 2/swingjs/timestamp
+++ b/swingjs/timestamp
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +20181105193243 
++=======
+ 20181101233424 
++>>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git

diff --cc swingjs/ver/3.2.4/SwingJS-site.zip
index 7774a16,c29d77b..e69de29
Binary files differ

diff --cc swingjs/ver/3.2.4/timestamp
index 38bba3f,75fd0a4..5bd0bac
--- 1/swingjs/ver/3.2.4/timestamp
--- 2/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +20181105193243 
++=======
+ 20181101233424 
++>>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git