A
Merge branch 'master' of https://github.com/iarczi/elektron_kinectbot

Conflicts:
	elektron_navigation/config/base_local_planner_params.yaml
a