Map branch

Map.tmx, wall.png, some bug fixes