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