Added a check to grab user location in profile
Merge branch 'master' of https://github.com/UWMLI/FieldResearchTool