Changed getNearbyMerchants and Customers to correct equation of calculating circular radius distance.  Also added butons for Network and GPS location.