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