User Management improvements; work on DDI-Editor import
Merge remote-tracking branch 'origin/master'