Merge pull request #3128 from vrabaud/master

update branches in vision_opencv
add slam_gmapping for indigo