Formatting.
Formatting.

Conflicts:
	OpenSim/Simulation/RegisterTypes_osimSimulation.cpp

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