add testCollision.
Remove failed tests in testCollision. (the tests are in 'fcl_primitive_collision_test' branch now).
Re-add previously failed tests in testCollision since the tests succeed with the newest FCL version
Merge branch 'origin/master'