Merge branch 'master' of git.rhrk.uni-kl.de:EIT-Wehn/dram.vp.system Conflicts: dram/src/simulation/SimulationManager.cpp