Merge branch 'master' of https://github.com/ros-industrial/industrial_calibration

Conflicts:
	industrial_extrinsic_cal/CMakeLists.txt
	industrial_extrinsic_cal/include/industrial_extrinsic_cal/basic_types.h
	industrial_extrinsic_cal/include/industrial_extrinsic_cal/calibration_job.hpp
	industrial_extrinsic_cal/package.xml
	industrial_extrinsic_cal/src/calibration_job.cpp

Ceres library caused interesting problems in CMakeLists.
Initial commit of yaml files which hold parameters for lab setup for testing purposes.
Updated camera params - will need further updates.
Merged ros-industrial master to this master.
Merging required some changes to camera_observer and ros_camera_observer files.
(member name changed from observation to observations, two virtual functions added)
Added test_ros_cam_obs.cpp.
Took most changes from rosi master from calibration_job.cpp. Took most local changes to CMakeLists.
Fixed merge conflicts
Merge branch 'master' of https://github.com/ros-industrial/industrial_calibration