no message
no message
Merge branch 'master' of https://github.com/saratum/mymasterthesis

Conflicts:
	omt-g editor/it.unibz.udig.visuallangparser.graph.model.tests/src/it/unibz/udig/visuallangparser/graph/omtcd/model/cd/tests/OMTGClassDiagramTest.java
	omt-g editor/it.unibz.udig.visuallangparser.graph/src/it/unibz/udig/visuallangparser/graph/parts/OMTClassEditPart.java
	omt-g editor/it.unibz.udig.visuallangparser.graph/src/it/unibz/udig/visuallangparser/graph/parts/OMTNodeEditPart.java