update exercise 2.1 (orig) to catkin and add missing include dirs