Fixed wrong type on Eigen::aligned_allocator. Allows compilation under macOS clang.

See merge request Simox/simox!26

Fix another compilation error (probably not discovered since core developers are doing Release builds ...?)

the friction coefficient of the floor plane can be modified; more meaningful…

See merge request Simox/simox!25

Some were already using it and this should be uniform to work properly.

added function to merge two workspacegrids, e.g. when searching for a pose that is usable for multiple grasps

* 'master' of gitlab.com:Simox/simox:
  added optional score out-parameter to WorkspaceGrid::getRandomPos()
  fix: memory leak if selection was used.
  added missing cloning of collision model
  Force adding a semicolon after VR_ASSERT and VR_ASSERT_MESSAGE in release mode
  Fix broken debug build
  added jacobi regularization for diff ik
  extended biRRT for armarx
  SimoxURDFFactory: Fixed loading of prismatic joints
  improved teast and added test comments
  added radian to mm scaling factor