Fixed a duplicate define name bug
Merge branch 'master' of https://github.com/karmas/robot_server