refactor timepickerInit to take inputelem and picker elem

* add return time picker init
add markup for return time picker
Merge branch 'cgdevelop' into fix-66-javascript-timepicker-2

Conflicts:
	app/assets/javascripts/trips/trips.js
fix merge bugs
db schema changes from running migrations
remove selected class from time picker markup
mark time item as selected based on input from server
Merge branch 'fix-66-javascript-timepicker-2' into fix-65-javascript-timepicker-1

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