Merge branch 'master', remote-tracking branch 'origin'
Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_robot
Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_robot
delete one of two nao-inits (bug fixed)
Merge pull request #139 from kochigami/delete-nao-init

Delete one of nao-inits (bug fixed)