Updated map for new maze, minor cleanups.
Merge branch 'master' of github:boschbc/NaoRobot
Merge branch 'master' of github:boschbc/NaoRobot