Fix #144: correct comment on setSelfCollidable()
Fix style of the last commit
Merge branch 'upstream/master'

Conflicts:
	dart/dynamics/Skeleton.h