Copy changes to the trip planning page
Merge branch 'dev'

Copy changes to Trip Plan page