some changes in the launch files
Merge branch 'master' of https://github.com/ruipimentelfigueiredo/ros-kuri-pkg

Conflicts:
	navigation/launch/haptic_navigation.launch
	navigation/launch/haptic_navigation.launch~
maps added
Merge branch 'master' of https://github.com/ruipimentelfigueiredo/ros-kuri-pkg