Fix map callback not being called
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
wip
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
Add spot http request to map. add config object.
reports add markers on the map
Adds settings button to top header bar
Edits small css title color change
Disable is_admin column for now
Merge pull request #231 from jamesongamble/myRisk

Add settings button to top header bar
Merge pull request #232 from ryojiosawa/bug/is_admin

Disable is_admin column for now
Add python file for processing
Merge pull request #233 from kmeurer/master

Add python file for processing data
clean unnecessary template output
merge conflicts from master
Update users and profile views
Merge pull request #234 from jjmerino/master

Add markers for events in the map.
Merge pull request #235 from ryojiosawa/web/user_profile

Update users and profile views to show proximity index and location data
Merge pull request #236 from suprbh/master

Enable background location tracking using settings tab
log message