fixed compilation errors
Merge branch 'master' of https://github.com/kuri-kustar/ros-kuri-pkg

Conflicts:
	navigation/CMakeLists.txt
	navigation/cfg/potential_field.cfg
	navigation/config/master_params.yaml
	navigation/config/potential_field.yaml
	navigation/launch/final.launch
	navigation/src/laser2pointcloud.cpp
	navigation/src/potential_field.cpp
deleted navigation because of git conflicts
added navigation again
Merge branch 'master' of https://github.com/kuri-kustar/ros-kuri-pkg