EDIT

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

extend biocase import

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

minor

ref #6166: import siblings if an specimen and smaller changes in ABCD
import

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

Conflicts:
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java

abcd import: association type living culture is a parent child relation

remove ImportReport in model branch

minor

specimen import/search changes