<<<<<<< HEAD 20181111143118 ======= 20181111141107 >>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git