merge

...hesis/ide/contentassist/antlr/TestgeneratorDSLParser.java

...e/contentassist/antlr/internal/InternalTestgeneratorDSL.g

...tentassist/antlr/internal/InternalTestgeneratorDSL.tokens

...tassist/antlr/internal/InternalTestgeneratorDSLLexer.java

...assist/antlr/internal/InternalTestgeneratorDSLParser.java

...ster/masterthesis/ide/.TestgeneratorDSLIdeModule.xtendbin

...nster/masterthesis/ide/.TestgeneratorDSLIdeSetup.xtendbin

...s.textgeneratordsl/model/generated/TestgeneratorDSL.ecore

...extgeneratordsl/model/generated/TestgeneratorDSL.genmodel

...erthesis/parser/antlr/internal/InternalTestgeneratorDSL.g

...sis/parser/antlr/internal/InternalTestgeneratorDSL.tokens

.../parser/antlr/internal/InternalTestgeneratorDSLLexer.java

...parser/antlr/internal/InternalTestgeneratorDSLParser.java

...rthesis/serializer/TestgeneratorDSLSemanticSequencer.java

.../masterthesis/services/TestgeneratorDSLGrammarAccess.java

...rthesis/testgeneratorDSL/BusinessRuleTaskFlowElement.java

...gen/de/fhmuenster/masterthesis/testgeneratorDSL/Test.java

...asterthesis/testgeneratorDSL/TestgeneratorDSLPackage.java

...estgeneratorDSL/impl/BusinessRuleTaskFlowElementImpl.java

...is/testgeneratorDSL/impl/TestgeneratorDSLPackageImpl.java