implement sort, navigation
Merge branch 'master' into restaurant
Merge branch 'Taxi' of https://github.com/minhtucs/SmartTravelClient into Taxi
add TX
Merge branch 'master' into Taxi
add Taxi in Trip