small changes
Merge branch 'master' of https://github.com/kunzel/human

Conflicts:
	human_following/scripts/human_following_client.py~
	human_following/scripts/human_following_server.py~
...
Merge pull request #2 from netfox001/master

small changes