from Master : Simulator.cpp

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

src/main/java/ui/ColorManager.java

src/main/java/ui/avatarbd/AvatarBDInterface.java

src/main/java/ui/avatarbd/AvatarBDPortConnector.java