Added more intuitive "Get Associated Ride" button
Merge branch 'master' of https://github.com/TaxiRating/Server
misc changes
Merge branch 'master' of https://github.com/TaxiRating/Server