20140902 From Laptop
Merge branch 'master' of github.com:PuritanWang/RobotForceControl