Merge branch 'feature/JAL-674_dssp' into features/JAL-1264_showHideAnnotations