# Conflicts:
#	source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp

Feature/armem object memory attachments

See merge request ArmarX/RobotAPI!145

aron fixes for better code generation. Finalized maybe types. Merged master and armem/dev into aron/dev. Fixed build issues. Repaired ArMemMemoryTest test since an update now adds a provider segment (instead of throwing MisingEntryException)

Statechart memory in the SkillsMemory

See merge request ArmarX/RobotAPI!142

Change ExampleMemoryClient

See merge request ArmarX/RobotAPI!150

* commit data every iteration
* add some changing data (set the_double to sin of the current time)
* increase frequency of run
* add comments