refactor
Merge remote-tracking branch 'origin/cgdevelop' into HEAD

Conflicts:
	Gemfile.lock
	app/assets/javascripts/kiosk/trips.js
	app/assets/javascripts/trips/trips.js
	app/views/kiosk/trips/_trip_form.html.haml
show start and stop markers, add in "to" step
wip
Continue refactor.
woops
fix return time
Trip wizard seems to be functioning
update geocode results, add back button
Link to new steps from homepage
arrive-depart / cleanup
whitespace
Whitespace
Return full trip purpose details for display on overview
Set default pickup date
first pass at handling server-side errors on client side on trip steps
handle server-side errors on client side on trip steps
Merge branch '117-split-trip-selection-form-into-individual-pages' of github.com:CG-CamSys/oneclick into 117-split-trip-selection-form-into-individual-pages
Fix issues with return time and final submit
fix placeholder text in 'From' text input