Merge branch 'master' into feature/skillMemoryGUI

...ies/PriorKnowledge/util/LocationLoader/LocationLoader.cpp

...s/PriorKnowledge/util/LocationLoader/datatypes/Location.h

source/RobotAPI/libraries/armem_locations/aron/Location.xml

...tAPI/libraries/armem_objects/client/class/ClassWriter.cpp

...botAPI/libraries/armem_objects/client/class/ClassWriter.h

source/RobotAPI/libraries/aron/common/CMakeLists.txt

source/RobotAPI/libraries/aron/common/aron_conversions.h

...RobotAPI/libraries/aron/common/aron_conversions/names.cpp

...e/RobotAPI/libraries/aron/common/aron_conversions/names.h

source/RobotAPI/libraries/aron/common/forward_declarations.h

source/RobotAPI/libraries/core/CMakeLists.txt

source/RobotAPI/libraries/core/Names.cpp

source/RobotAPI/libraries/core/Names.h

source/RobotAPI/libraries/core/forward_declarations.h

source/RobotAPI/libraries/core/json_conversions.cpp

source/RobotAPI/libraries/core/json_conversions.h