Fix compile error in testCollision.cpp and commented out sphere-sphere collision test (failed to pass).
Merge branch 'origin/master'