Merge remote-tracking branch 'origin/master' into StackTrace
Conflicts: src/main/java/de/monticore/lang/monticar/generator/cpp/template/AllTemplates.java src/main/java/de/monticore/lang/monticar/generator/cpp/GeneratorCppCli.java
Conflicts: src/main/java/de/monticore/lang/monticar/generator/cpp/template/AllTemplates.java src/main/java/de/monticore/lang/monticar/generator/cpp/GeneratorCppCli.java