Small changes
Small tweaks
Merge branch 'master' of github.com:davetcoleman/moveit_hrp2

Conflicts:
	hrp2jsknt_moveit_demos/launch/moveit.rviz