Merge branch 'master'

Conflicts:
	dart/dynamics/PlanarJoint.cpp
	dart/dynamics/PlanarJoint.h