Merged rosi-industrial master to gomezc master

Fixed small build issues from small differences in camera_observer, and CMakeLists to make buildable.