Fix compilation failure on linux for SWIG wrapping output
Merge branch 'iterator' of https://github.com/opensim-org/opensim-core into iterator

Conflicts:
	OpenSim/Common/ComponentList.h