clean up both trackcontrol and gridtrajectorycontrol
Merge remote-tracking branch 'origin/master'