Merge branch 'master' into SensorPackage

Conflicts: source/RobotAPI/drivers/OrientedTactileSensor/OrientedTactileSensorUnit.cpp source/RobotAPI/drivers/OrientedTactileSensor/OrientedTactileSensorUnit.h source/RobotAPI/libraries/CMakeLists.txt

Merge branch 'master' into SensorPackage
febc3937 · andreeatulbure · f393f464 · daf846f6 · febc3937 · febc3937
Commit febc3937 authored 7 years ago by andreeatulbure
--- a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
+++ b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
--- a/source/RobotAPI/libraries/core/remoterobot/RemoteRobotNode.cpp
+++ b/source/RobotAPI/libraries/core/remoterobot/RemoteRobotNode.cpp
--- a/source/RobotAPI/statecharts/StatechartProfilesTestGroup/StatechartProfilesTestGroupRemoteStateOfferer.h
+++ b/source/RobotAPI/statecharts/StatechartProfilesTestGroup/StatechartProfilesTestGroupRemoteStateOfferer.h