Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

Conflicts:
	cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java
	cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
	cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java
	cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IPolytomousKeyNodeService.java
	cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java
	cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
	cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/PolytomousKeyNodeServiceImpl.java
	cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
	cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java