added some rudimentary location awareness to compute distance fromphone location to bus stops on route
fixed project file merge conflict