Added searching for set locationsto improve the search strings going into the geolocator.
Merge branch 'master' of github.com:WesAppGroup/prototype-server