date picker reveal on "next form item"
Merge branch 'tripformView-refactor' into 12-location-question

Conflicts:
	app/views/trips/_trip_form.html.haml
fix post-merge issues after refactoring.
Merge branch '12-location-question' of github.com:CG-CamSys/oneclick into 12-location-question