Mockup 3

Fixed adding of markers on the map, e.t.c...