Add more collision tests to testCollision.
Commented out failed collision tests.
Uncomment sphere-sphere collision tests since I fixed the bug in FCL and they run successfully now
Merge branch 'origin/master'