surfel estimator functors -> functors::
concepts
resolve conflict
Merge pull request #12 from kerautret/testimatorFunctors

for conflict
Merge pull request #911 from dcoeurjo/estimatorFunctors

surfel estimator functors -> functors::