Merge branch 'develop' of git.rwth-aachen.de:monticore/EmbeddedMontiArc/generators/cnnarch2x into develop