More work on maps.
Merge branch 'master' of github:boschbc/NaoRobot