Small fix in collision detection demo to exit gracefully when cgal is not present
Merge branch 'master' into next