date and time on trip form working now...
fixes missed merge
Merge branch 'master' of github.com:OpenTransitTools/view

Conflicts:
	ott/view/templates/desktop/planner_form.html