bring in dave's fix-22/23 changes
wire up time picker
remove drop down time picker
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
Merge branch 'cgdevelop' into fix-65-javascript-timepicker-1

Conflicts:
	app/assets/javascripts/trips/trips.js
remove hard-coded static class in time markup
add missing para,s for time picker
time picker display correct time items selected based on what was populated by the server in the input field
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
removing current location for now.
Merge pull request #20 from CG-CamSys/suppress-current-location

removing current location for now.
fix 4:40 typo
fix multiple times being selected when input time is between 10 and 12
Merge branch 'cgdevelop' into fix-65-javascript-timepicker-1