locomotion planner interface update
Merge branch 'master' of https://github.com/valeriovarricchio/DRC_catkin

Conflicts:
	QtViz/src/main_interface/myviz.ui