Merge pull request #116 from Street-Meet/staging

Merging test suite updates from stage
centered map marker loc
Merge pull request #117 from TonOfPrince/map

Map