Updated definition of locationData and tour to better match reality.
LocationData now a class. Added some features to
TourDataSaverAndRetriever