EDIT

use real URI in getTermByUri

bugfix for #2558 (concurrent modification in TaxonNodeServiceImpl.makeTaxonNodeASynonymOfAnotherTaxonNode(...) )

sync trunk

adding permission handling and writing a test for usermanagement

moved all validation tests to model, except ValidationTest
wrote validation for references

deleting old and orphan config file

bugfix for imageGallery flag not set #1830

tests for image galleries in derived unit facade and bugfix for test in DescriptionServiceImplTest which didn't run in maven.

Refactoring of taxon business logic methods and started to write tests for these methods. The tests are far from finished.