collision: cleaning primitive discrete-/proximity-intersections

git-svn-id: svn://scm.gforge.inria.fr/svnroot/sofa/trunk@9626 b7f1a160-662a-0410-a6d8-bea165342f16
update Flexible and Image: on going work on branching grids. Add working example with HexaFEM including fine volume computation

git-svn-id: svn://scm.gforge.inria.fr/svnroot/sofa/trunk@9627 b7f1a160-662a-0410-a6d8-bea165342f16
fixed warnings

git-svn-id: svn://scm.gforge.inria.fr/svnroot/sofa/trunk@9628 b7f1a160-662a-0410-a6d8-bea165342f16
collision: cleaning

git-svn-id: svn://scm.gforge.inria.fr/svnroot/sofa/trunk@9629 b7f1a160-662a-0410-a6d8-bea165342f16
Compliant: sofa black magic cleaning

git-svn-id: svn://scm.gforge.inria.fr/svnroot/sofa/trunk@9630 b7f1a160-662a-0410-a6d8-bea165342f16
cmake: Fix additional Cuda options

git-svn-id: svn://scm.gforge.inria.fr/svnroot/sofa/trunk@9631 b7f1a160-662a-0410-a6d8-bea165342f16