83: clean up RobotMap
add to project.xml
83: cleaned up RobotMap and fixed conflict