Added waypoints to journey views
Renaming matches.php to mached_journeys.php for better comprehension && added waypoints information into  mached journeys view
merge