EDIT

fix NPE in ParseHandler

ref #8294: add preference page for id in namespace and namespace in source

ref #7920: fix delete of preferences

minor - avoid NPE

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

smaller changes for abcd imports in tax editor

Add facet information to term search result composite

ref #8248 Set import source citation in import wizard

ref #7589 Save matrix rows in one service call

ref #8335 minor fixes for active state evaluation