Fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Footprints/Views/Journey/EditJourneyForm.cshtml
Fix
Merge remote-tracking branch 'origin/master'