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