Merge pull request #6230 from vrabaud/master

bump nao_robot
bump nao_viz