Refactor MyRiskCtrl to retrieve user_id
added device ready for background geolocation service
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp

Conflicts:
	mobile/www/js/app.js
debugging messages added ...to be removed once issues are fixed
Merge pull request #285 from jjmerino/master

Roll back to html map
revert changes for now to make build pass
Merge pull request #283 from suprbh/master

added device ready for background geo location service
Begins working on updating settings page
Continues working on settings template for user stats
Adds angular binding to username and email in settings view
Adds edit button to settings page, adds edit info page. Edit page not yet functional
Adds our logo into mobile app
Updates routes for PUT to api/users, needs to update user view on success
Updates routes for PUT to api/users, needs to update user view on success
Adds user edit functionality for Name and Email, needs to get current user id still
Uncomments backgroundGeoLocation
Merge pull request #286 from jamesongamble/iconOnlyTabs

Adds in company logo, adds edit settings page, needs to add userid to put request New Request
modifications to accomodate format of location data sent from background geolocation service
Merge pull request #287 from suprbh/master

Add modifications to accomodate format of location data sent from background geolocation service