Merge branch 'master' of...
Merge branch 'master' of https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/basic-simulator into sim_dev
Merge branch 'master' of https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/basic-simulator into sim_dev