Merge remote-tracking branch 'origin/master' into armem/dev

source/RobotAPI/applications/AronCodeGenerator/main.cpp

...aron/codegeneration/codegenerator/codewriter/CodeWriter.h

...on/codegeneration/codegenerator/codewriter/cpp/Writer.cpp

...tion/codegenerator/codewriter/cpp/generator/Generator.cpp

...erator/codewriter/cpp/generator/toplevel/IntEnumClass.cpp

...enerator/codewriter/cpp/generator/toplevel/IntEnumClass.h

...nerator/codewriter/cpp/generator/toplevel/ObjectClass.cpp

...ies/aron/codegeneration/codegenerator/helper/ReaderInfo.h

...ies/aron/codegeneration/codegenerator/helper/WriterInfo.h

...obotAPI/libraries/aron/codegeneration/test/CMakeLists.txt

...libraries/aron/codegeneration/test/aronConversionTest.cpp

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

...aries/aron/core/codegeneration/cpp/AronGeneratedIntEnum.h

...raries/aron/core/codegeneration/cpp/AronGeneratedObject.h