# Conflicts:
#	source/RobotAPI/libraries/armem/core/diskmemory/CoreSegment.cpp

added JSON conversion to Aron code generation, first working version of motion memory, added a addInstance method to Snapshot

# Conflicts:
#	source/RobotAPI/libraries/armem/core/diskmemory/CoreSegment.cpp

ArViz: Replace Coin timer by QtTimer to fix ArViz from freezing...

See merge request ArmarX/RobotAPI!183

(FP, RK) ArViz: Replace Coin timer by QtTimer to fix ArViz from freezing (update() would not be called in some cases)