some tests
Merge branch 'master' of https://github.com/dvj-shimbo/kragstein

Conflicts:
	Kragstein/.settings/org.eclipse.core.resources.prefs
	Kragstein/model/project.ecore_diagram