icp
Merge branch 'master' of https://github.com/ruipimentelfigueiredo/object_recognition

Conflicts:
	objectrecognition/CMakeLists.txt.user
some changes