small change to proximity controller.
Change default route to '/tab/map'
Merge pull request #229 from kmeurer/master

small change to proximity controller.
Remove unnecessary modules and views
Adds My Risk view and Report view
Edits some more css for myrisk and report views
Adds a settings tab for priya for testing
Merge pull request #228 from jamesongamble/myRisk

Adds My Risk view and Report view
Add SettingCtrl to control locationTracking setting
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp into mobile/setting

Conflicts:
	mobile/www/js/app.js
	mobile/www/js/utils.js
Remove extra space
Merge pull request #230 from ryojiosawa/mobile/settings

Add Settings controller/service to control locationTracking feature
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
merge conflicts from master