Adapt Cmake files for FLANN only being a build dependency
Merge branch 'origin/master'