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

Conflicts:
	mobile/www/templates/track.html
added map to tab
Merge pull request #219 from jjmerino/master

added map to tab
Add reported_cases table and new REST endpoints
Continues UI integration
Adds more css changes
Adds services page, begins angular localStorage options
Merge pull request #221 from jamesongamble/settingsView

Add Settings page with tracking toggle, progress towards saving settings to localStorage
Merge pull request #220 from ryojiosawa/reported_cases

Add reported_cases table and new REST endpoints
Fix map callback not being called
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
Progress towards localStorage
Merge pull request #224 from jamesongamble/settingsView

Progress towards local storage
added back display due to merge conflict
merging changes
merge
wip
Add new Reported Cases page