Merge branch 'master' of git.rwth-aachen.de:monticore/EmbeddedMontiArc/languages/CNNArchLang into develop