EDIT

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

extend excel import for tropicos

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

Clean up deprecated methods in name service

ref #5974 Replace synonymRelationshipType by SynonymType and replace some other occurrences of synonym relationship

specimen import/search changes

Revert "fix #6037 per batch transction commit implemented for excel imports"

This reverts commit 53067226137bd8528e6bc26f21edbf98aebe26a9.

minor

minor

smaller changes for importing nom. reference in normal explicit excel import