some changes
Merge branch 'master' of github.com:carpe-noctem-cassel/cnc-naos

Conflicts:
	test_nao/src/talker.cpp