Resolved conflicts in NearbyStops

Resolved some conflicts in the NearbyStops.java. Rob, I hope I didn't
mess with any of your in progress code >__< The app will crash
occasionally because of ArrayOutOfBounds exception on the StackState and
getFragments.get(getBackStackEntryCount()-1), I hope that's not because
of the conflicts....