Merge branch 'torso_server'

Conflicts:
	CMakeLists.txt
	package.xml