Merge branch 'floDevelopment' into development
Merged
formatter angepasst
Merge branch 'haglo-development' into development

Conflicts:
	org.lunifera.ecview.dsl.ui/xtend-gen/org/lunifera/ecview/dsl/ui/labeling/.UIGrammarLabelProvider.java._trace
	org.lunifera.ecview.dsl.ui/xtend-gen/org/lunifera/ecview/dsl/ui/labeling/UIGrammarLabelProvider.java
	org.lunifera.ecview.dsl.ui/xtend-gen/org/lunifera/ecview/dsl/ui/outline/.UIGrammarOutlineTreeProvider.java._trace