removing unused lines
minor changes
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp

Conflicts:
	mobile/www/templates/track.html
Fix map callback not being called
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
added back display due to merge conflict
merging changes
merge
wip
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
Add spot http request to map. add config object.
moving backgeoloc from controller to factory
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp

Conflicts:
	mobile/www/js/services.js
	mobile/www/js/utils.js
reports add markers on the map
fix merge
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