Distance path.
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	app/views/locations/show.html.erb