Fix bug in calculation of skeleton mass if Skeleton::initSkel() is called multiple times
Merge branch 'origin/master'

Conflicts:
	src/kinematics/Skeleton.cpp