On branch enhancement_3d_rec_framework
Changes to be committed:
	modified:   apps/3d_rec_framework/tools/apps/src/local_recognition_mian_dataset.cpp
Merge branch 'enhancement_3d_rec_framework' of https://github.com/drmateo/pcl into enhancement_3d_rec_framework

Conflicts:
	apps/3d_rec_framework/tools/apps/src/local_recognition_mian_dataset.cpp