Apply patch from pr2_teleop_general_jsk_patch
Merge branch 'jsk-patch' into jsk-patch-for-hydr-devel

Conflicts:
	pr2_teleop_general/manifest.xml
	pr2_teleop_general/src/pr2_teleop_general_commander.cpp
Merge pull request #1 from garaemon/jsk-patch-for-hydr-devel

test