Add facets
Merge remote-tracking branch 'origin/master'

Conflicts:
	ee-mdd-core/src/main/groovy/ee/mdd/builder/ModelBuilder.groovy