no scroll on map
Merge pull request #111 from TonOfPrince/map

no scroll on map
Merge pull request #112 from Street-Meet/staging

Staging