[Fixes #53982877] Removes styling from in-line html and moves it to CSS classes.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/views/trips/show.html.haml
[#53982877] Fixes formatting and duration_to_words method for the itineraries page.