EDIT

ref #6190 removing svn property place holder in first line of code

minor

fix #6236 add alphabetic length ordering to name search

Cleanup

fix #6128 include authorship option in taxon and name search

ref #6199 test for reading excluded, unplaced and excludedNote

solving polytomouskey node sort index problems

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java
cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestModelUpdate.java

cleanup

ref #5974 implement substitute method for TaxonService.getAllRelationships