Small bug fixes
Merge branch 'master' of https://github.com/Barista-Bot/movement-control

Conflicts:
	CMakeLists.txt
	scripts/movement_client.py
	scripts/movement_server.py