Test

Discard impossible
Merge remote-tracking branch 'origin/master'

Conflicts:
	EFML/model/exampleModel.xmi
	EFML/model/forms.aird
	EFML/model/forms.ecore