* origin/master:
  reverted cmake
  modified dmpcontroller
  Remove .orig files
  Fix dependency of RobotAPINjointControllers to MMM
  Use '#pragma once' instead of include guards
  modified dmpcontroller
  finished coding njointccdmpcontroller
  fixed building; added njointccdmpcontroller
  added njointtsdmpcontroller