merge-update from trunk

diff --combined .gitattributes
index 3bdd135049398bdcf3b04cf8971e7bb1097f70e5,b581c548c7bf0443c0b1f599fc7f8df48fc2cf12..e26e8837047dbfab99519e5bda3987a1ec6ec5a1
--- 1/.gitattributes
--- 2/.gitattributes
+++ b/.gitattributes
@@@ -222,8 -222,8 +222,8 @@@ eu.etaxonomy.taxeditor.cdmlib/lib/jboss
  eu.etaxonomy.taxeditor.cdmlib/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/jdbc4-2.0.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/jdom-1.1.3.jar -text
- eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.12.1-SNAPSHOT.jar -text
- eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.1.1-SNAPSHOT.jar -text
+ eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.11.2.jar -text
+ eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.0.2.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.1.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/json-lib-2.4-jdk15.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/jsr250-api-1.0.jar -text
@@@ -358,11 -358,6 +358,11 @@@ eu.etaxonomy.taxeditor.editor/icons/edi
  eu.etaxonomy.taxeditor.editor/icons/emblem-photos.png -text
  eu.etaxonomy.taxeditor.editor/icons/leaf_detail.png -text
  eu.etaxonomy.taxeditor.editor/icons/xper64.png -text
 +eu.etaxonomy.taxeditor.editor/lib/biojava3-alignment-3.0.7.jar -text
 +eu.etaxonomy.taxeditor.editor/lib/biojava3-core-3.0.7.jar -text
 +eu.etaxonomy.taxeditor.editor/lib/commons-lang3-3.1.jar -text
 +eu.etaxonomy.taxeditor.editor/lib/core-1.8.5.jar -text
 +eu.etaxonomy.taxeditor.editor/lib/sequencing-1.8.5.jar -text
  eu.etaxonomy.taxeditor.editor/p2.inf -text
  eu.etaxonomy.taxeditor.editor/plugin.xml -text
  eu.etaxonomy.taxeditor.editor/pom.xml -text
@@@ -387,7 -382,6 +387,7 @@@ eu.etaxonomy.taxeditor.editor/src/main/
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/handler/EditCdmAuthoritiesHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/EditNewTaxonHandler.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenAlignmentEditor.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenChecklistEditorHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenParentHandler.java -text
@@@ -420,10 -414,6 +420,10 @@@ eu.etaxonomy.taxeditor.editor/src/main/
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/CreateNodeOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/DeleteNodeOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/RefreshNodeNumberingOperation.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditorInput.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/CMDAlignmentObjectPlaceholder.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/ContigSequenceDataProvider.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/AbstractGroup.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/AbstractGroupedContainer.java -text
@@@ -593,10 -583,7 +593,10 @@@ eu.etaxonomy.taxeditor.editor/src/main/
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseRecordOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseSummaryOperation.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR430_JR-P01.ab1 -text
 +eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR444_JR-P05.ab1 -text
  eu.etaxonomy.taxeditor.editor/src/main/resources/TaonDescriptionEditor.screen -text
 +eu.etaxonomy.taxeditor.editor/src/main/resources/TestPherogram_qualityScore.scf -text
  eu.etaxonomy.taxeditor.editor/src/main/resources/log4j.properties -text
  eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/Application.java -text
  eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationActionBarAdvisor.java -text