various
various
Merge branch 'master' of https://github.com/ibrahima/trajopt_plugin

Conflicts:
	CMakeLists.txt
	src/planning_server.py
	src/test_move_group.py
Merge branch 'master' of https://github.com/ibrahima/trajopt_plugin

Conflicts:
	src/move_group_battery.py