EDIT

fix call of removed method getAllRelationships

ref #8568: performance issues for term and voc preference pages

correct handling of allowOverride in taxonnode admin preferences

fix #8226: add new preferences for modifiers

Combine "feature" and "question" column

Fix "feature" column

Add "feature" column to polytomous key node editor

Fix potential NPE

Merge branch 'master' into develop

fix import