Updating for catkin
Merge pull request #2 from ethz-asl/fix/updates-for-catkin

Updating for catkin