Enhanced the grammar and its derviced state
Merge branch 'development' of
git@github.com:lunifera/lunifera-ecview-addons.git into development

Conflicts:
	org.lunifera.ecview.dsl.ui/bin/org/lunifera/ecview/dsl/ui/contentassist/antlr/internal/InternalUIGrammar.g
	org.lunifera.ecview.dsl.ui/bin/org/lunifera/ecview/dsl/ui/contentassist/antlr/internal/InternalUIGrammar.tokens
	org.lunifera.ecview.dsl.ui/src-gen/org/lunifera/ecview/dsl/ui/contentassist/AbstractUIGrammarProposalProvider.java
	org.lunifera.ecview.dsl.ui/src-gen/org/lunifera/ecview/dsl/ui/contentassist/antlr/UIGrammarParser.java
	org.lunifera.ecview.dsl.ui/src-gen/org/lunifera/ecview/dsl/ui/contentassist/antlr/internal/InternalUIGrammar.g
	org.lunifera.ecview.dsl.ui/src-gen/org/lunifera/ecview/dsl/ui/contentassist/antlr/internal/InternalUIGrammar.tokens
	org.lunifera.ecview.dsl.ui/src-gen/org/lunifera/ecview/dsl/ui/contentassist/antlr/internal/InternalUIGrammarLexer.java
	org.lunifera.ecview.dsl.ui/src-gen/org/lunifera/ecview/dsl/ui/contentassist/antlr/internal/InternalUIGrammarParser.java
	org.lunifera.ecview.dsl/bin/org/lunifera/ecview/dsl/UIGrammar.xtext
	org.lunifera.ecview.dsl/bin/org/lunifera/ecview/dsl/UIGrammar.xtextbin
	org.lunifera.ecview.dsl/bin/org/lunifera/ecview/dsl/parser/antlr/internal/InternalUIGrammar.g
	org.lunifera.ecview.dsl/bin/org/lunifera/ecview/dsl/parser/antlr/internal/InternalUIGrammar.tokens
	org.lunifera.ecview.dsl/src-gen/org/lunifera/ecview/dsl/UIGrammar.xtextbin
	org.lunifera.ecview.dsl/src-gen/org/lunifera/ecview/dsl/parser/antlr/internal/InternalUIGrammar.g
	org.lunifera.ecview.dsl/src-gen/org/lunifera/ecview/dsl/parser/antlr/internal/InternalUIGrammar.tokens
	org.lunifera.ecview.dsl/src-gen/org/lunifera/ecview/dsl/parser/antlr/internal/InternalUIGrammarLexer.java
	org.lunifera.ecview.dsl/src-gen/org/lunifera/ecview/dsl/parser/antlr/internal/InternalUIGrammarParser.java
	org.lunifera.ecview.dsl/src-gen/org/lunifera/ecview/dsl/serializer/UIGrammarSemanticSequencer.java
	org.lunifera.ecview.dsl/src-gen/org/lunifera/ecview/dsl/serializer/UIGrammarSyntacticSequencer.java
	org.lunifera.ecview.dsl/src-gen/org/lunifera/ecview/dsl/services/UIGrammarGrammarAccess.java
	org.lunifera.ecview.dsl/src/org/lunifera/ecview/dsl/UIGrammar.xtext
	org.lunifera.ecview.dsl/src/org/lunifera/ecview/dsl/derivedstate/UiModelDerivedStateComputerx.xtend
	org.lunifera.ecview.dsl/xtend-gen/org/lunifera/ecview/dsl/derivedstate/UiModelDerivedStateComputerx.java
	org.lunifera.ecview.semantic.uimodel/model/UIGrammarCore.ecore
	org.lunifera.ecview.semantic.uimodel/src/org/lunifera/ecview/semantic/uimodel/UiModelFactory.java
	org.lunifera.ecview.semantic.uimodel/src/org/lunifera/ecview/semantic/uimodel/UiModelPackage.java
	org.lunifera.ecview.semantic.uimodel/src/org/lunifera/ecview/semantic/uimodel/impl/UiModelFactoryImpl.java
	org.lunifera.ecview.semantic.uimodel/src/org/lunifera/ecview/semantic/uimodel/impl/UiModelPackageImpl.java
	org.lunifera.ecview.semantic.uimodel/src/org/lunifera/ecview/semantic/uimodel/util/UiModelAdapterFactory.java
	org.lunifera.ecview.semantic.uimodel/src/org/lunifera/ecview/semantic/uimodel/util/UiModelSwitch.java
	org.lunifera.ecview.semantic.uimodel/text/description.txt