removed TraitHasLabel from Model
Merge branch 'master' into dev-master