Merge branch 'master' into chore/to_realtime

source/RobotAPI/interface/armem/query.ice

...e/RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp

source/RobotAPI/libraries/armem/core/longtermmemory/Memory.h

...ce/RobotAPI/libraries/armem/core/workingmemory/Memory.cpp

source/RobotAPI/libraries/armem/core/workingmemory/Memory.h

...ce/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp

...s/armem/server/query_proc/diskmemory/BaseQueryProcessor.h

source/RobotAPI/libraries/armem_gui/MemoryControlWidget.cpp

source/RobotAPI/libraries/armem_gui/MemoryControlWidget.h

source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp

...raries/armem_gui/query_widgets/SnapshotSelectorWidget.cpp

...ibraries/armem_gui/query_widgets/SnapshotSelectorWidget.h