Resolved some conflicts in BodyActuator.h with master
Resolved some conflicts in BodyActuator.h with master

opensim-org/opensim-core,opensim-org/opensim-core,opensim-org/opensim-core,opensim-org/opensim-core,opensim-org/opensim-core,opensim-org/opensim-core,opensim-org/opensim-core