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

Conflicts:
	objectrecognition/CMakeLists.txt.user
	objectrecognition/src/ros_objectrecognition_sv/household_object_detector_server.cpp