Added changes
Merge branch 'master' of github.com:ajgustafsson/mde

Conflicts:
	Model2Model/transforms/workflow2Petrinet.qvto