Merge softFeetAtlasRobot app to atlasRobot