More reactive to bumps
Merge branch 'master' of https://github.com/MichaelMathieu/neuromorphsSLAM

Conflicts:
	python/controller.py