edit trip button now disappears
Merge pull request #15 from CG-CamSys/59-edit-btn-disappears

edit trip button now disappears
updated style for stop class, but Dines should technically have the official last say
Merge branch 'cgdevelop' into fix-57-next-button-validation
fixed double click-event on edit trip
fix double click-event issue when doing multiple trip edits
Merge pull request #16 from CG-CamSys/fix-57-next-button-validation

Fix 57 next button validation
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