Display email modal
ecolane
Display ecolane results
Merge remote-tracking branch 'origin/develop' into 151-hook-up-email-provider-button-and-small-design-tweaks

Conflicts:
	app/views/kiosk/trips/show.html.haml
wip
Merge remote-tracking branch 'origin/develop' into 148-ecolane
show the modal.
cleanup
Merge remote-tracking branch 'origin/develop' into 148-ecolane
get email form working
Try preloading the constant so it doesn't have issues loading later on
update copy
Adjustments to booking button
Merge pull request #153 from CG-CamSys/148-ecolane

148 ecolane
Merge remote-tracking branch 'origin/develop' into 276-minor-copy-edits
Merge pull request #155 from CG-CamSys/276-minor-copy-edits

update copy
Merge remote-tracking branch 'origin/develop' into 151-hook-up-email-provider-button-and-small-design-tweaks

Conflicts:
	app/views/kiosk/trips/show.html.haml
botched the merge
fix
fix for bookings always having a return reservation