Created costmap for path finding node
Fixed merge conflict
Merge branch 'valeRB-master'