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