йободіалог
Merge remote-tracking branch 'origin/master'

Conflicts:
	Razom/Views/Trip/Show.cshtml