Merge branch 'origin/master'

Conflicts:
	src/dynamics/Skeleton.cpp
Merge branch 'origin/mass_matrix'

Conflicts:
	src/dynamics/Skeleton.cpp