Merge remote-tracking branch 'origin/master' into currentControl

README.md

README.txt

docs/README.md

docs/armem/README.md

docs/armem/existing_memory_servers_and_segments/README.md

...ry_servers_and_segments/RobotState/Localization/README.md

..._memory_servers_and_segments/RobotState/Mapping/README.md

.../RobotState/Mapping/res/transformations_frames-Page-2.png

docs/armem/introduction/README.md

docs/aron/README.md

docs/aron/conversion/README.md

docs/aron/introduction/README.md

docs/aron/visitors/README.md

etc/doxygen/images/armem/RobotState/localization/frames.png

...ages/armem/RobotState/localization/localization-armem.png

etc/doxygen/pages/HowTos.dox

etc/doxygen/pages/Overview.md

etc/doxygen/pages/Tutorials.dox

etc/doxygen/pages/Tutorials.md

etc/doxygen/pages/armem/RobotState/localization.md