Improvement of collision detection demo
Merge branch 'logg/topic-ccfem'