fix some bugs regarding subsetting and composition
Merge remote-tracking branch 'origin/master'

Conflicts:
	demo/bankfrauddetection/bankfrauddetection-application/bankfrauddetection-entities/src/main/generated-resources/umlg.internal.properties