small change to proximity controller.
Merge pull request #229 from kmeurer/master

small change to proximity controller.
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
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp into mobile/setting

Conflicts:
	mobile/www/js/app.js
	mobile/www/js/utils.js