Conflicts:
	plugins/org.obeonetwork.dsl.uml2.design/description/uml2.odesign