improved CND elements label providers
Merge branch 'master' of github.com:evra/cnd-editor