changed locations in location screen to regions of interest and added location object for the rest of the app to use
Merge remote-tracking branch 'origin'
added fields to location objects
Merge remote-tracking branch 'origin'