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