I added some launch files for testing the PID controller with the haptic.
Merge branch 'master' of https://github.com/kuri-kustar/ros-kuri-pkg

Conflicts:
	mitsubishi_arm_barret_hand/mitsubishi_arm_barrett_hand_description/CMakeLists.txt
	navigation/launch/final.launch~
	navigation/launch/haptic_navigation.launch~
	navigation/launch/haptic_navigation_potential_field.launch~