Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_control
Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_control
Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_control
wait controller until it's activated with infinite timeout
Merge pull request #23 from garaemon/wait-controller-until-it-activated

Wait controller until it activated when creating robot-interface
added staro specific code for ik-server
Merge pull request #25 from mmurooka/staro-ik-server

added staro specific code for ik-server
Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_control
add additional-ik-options
add IK_OPTION argument to hrp2jsk-ik-server-test.launch
add staro-ik-server.launch
add IK_OPTION argument to staro-ik-server-test.launch
Merge pull request #27 from YoheiKakiuchi/additional-ik-options

Additional ik options
Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_control
make midi_config_player available for hydro
Merge pull request #30 from core-dump/make-midi_config_player-available-for-hydro

make midi_config_player available for hydro
fix midi_config_player for groovy
Merge pull request #31 from core-dump/fix-midi_config_player-for-groovy

fix midi_config_player for groovy
make interactive_midi_config available for hydro
Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_control