MERGE
Merge branch 'master' of github.com:INRIA/VisualSedimentation