Changed Documents for Devel
Merge branch 'master' of https://github.com/jpmerc/rosWS

Conflicts:
	custom_ros/src/custom_navigation/custom_navigation.sh
Merge branch 'master' of https://github.com/jpmerc/rosWS
Merge branch 'master' of https://github.com/jpmerc/rosWS
Merge branch 'master' of https://github.com/jpmerc/rosWS
Merge branch 'master' of https://github.com/jpmerc/rosWS
Merge branch 'master' of https://github.com/jpmerc/rosWS
Merge branch 'master' of https://github.com/jpmerc/rosWS
Changed the default location on battery infos
Merge branch 'master' of https://github.com/jpmerc/rosWS
Merge branch 'master' of https://github.com/jpmerc/rosWS

Conflicts:
	custom_ros/src/custom_navigation/custom_navigation.sh
Merge branch 'master' of https://github.com/jpmerc/rosWS
Merge branch 'master' of https://github.com/jpmerc/rosWS
Changed some params in the planner and localization.