adding map fragment
fixing the map
map bugs
master merge