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

Conflicts:
	mobile/www/templates/track.html
added back display due to merge conflict
merging changes
merge
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
fix merge
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
enable/disable background geo tracking using settings tab
Merge pull request #236 from suprbh/master

Enable background location tracking using settings tab
get real data from production postgres