Merge branch 'master' of https://github.com/ralphgerbig/melanee-textdsl

Conflicts:

plugins/de.uni_mannheim.informatik.swt.mlm.visualization.textual.modeled
itor/.gitignore
	plugins/de.uni_mannheim.informatik.swt.models.ebnf/.gitignore

plugins/de.uni_mannheim.informatik.swt.models.plm.textualrepresentation.
weaving/.gitignore
added LiteralChoice heuristic
new general model
merge
cleaned grammar model, by removing edit and editor projects