scroll is disabled
scroll is disabled
Merge branch 'cgdevelop' into 70-disable-scroll
hide 'Next' button on 'Need a return trip?' page
Ensure 'Purpose' is a required field: disable 'Next Step' button until a Purpose is selected.
Merge pull request #21 from CG-CamSys/70-disable-scroll

70 disable scroll
Merge branch 'cgdevelop' into 69-remove-next-btn-from-need-return-trip-page
make 'next step' button available when user clicks 'edit trip'
more work on hiding/showing next step button
Merge pull request #23 from CG-CamSys/69-remove-next-btn-from-need-return-trip-page

hide 'Next' button on 'Need a return trip?' page
Merge branch 'cgdevelop' into 84-make-purpose-required
removed lines that merge didn't remove
Merge pull request #24 from CG-CamSys/84-make-purpose-required

Ensure 'Purpose' is a required field
Merge branch 'cgdevelop' into 85-return-trip-time-respond-to-outbound-trip-time

Conflicts:
	app/assets/javascripts/trips/trips.js