EDIT

fix #6296: include the common name search into the search query of taxa and synonyms

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

ref #5974 implement substitute method for TaxonService.getAllRelationships

Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java...