Merge branch 'revert-883077ef' into 'master'

simulators/c++2/src_simulator/arch/CPU.cpp

simulators/c++2/src_simulator/arch/MultiCoreCPU.cpp

simulators/c++2/src_simulator/sim/Simulator.cpp

src/main/java/ui/MainGUI.java

src/main/java/ui/TGComponent.java

...ui/interactivesimulation/JFrameInteractiveSimulation.java

src/main/java/ui/tmldd/TMLArchiCPUNode.java

.../test/java/tmltranslator/CPUDoubleClickShowTraceTest.java

ttool/src/test/java/tmltranslator/MulticoreHangingTest.java

...t/resources/tmltranslator/simulator/SmartCardProtocol.xml

...est/resources/tmltranslator/simulator/multicore_trace.xml