Merge miguelscd:devel onto new devel-catkin branch

Catkinization of nao_common is pending for ROS hydro, requires catkinized move_base_msgs