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
enable/disable background geo tracking using settings tab
Merge pull request #236 from suprbh/master

Enable background location tracking using settings tab