Added portype of trajectory follower controller. fixed merge problems