Merged with felix and updates for indigo

please use cob_msgs