map now shows activities
Merge branch 'master' into map_display
Merge pull request #33 from arieldiamond/map_display

Map display