merge tryal
Merge branch 'master' of https://github.com/kuhbaar/modeleng

Conflicts:
	ModelEng_lab1/model/EFML_model.xmi
	ModelEng_lab1/model/forms.ecore