test edit to test notifications
Merge
Bump version #, show version in footer, fix display of bootstrap modes in development.
Merge branch 'release-0.2'

Conflicts:
	README.textile
Move seed data creation to standard seeds.rb. [Fixes #54286972]
Commit so can pull onto another machine.
Fix possible error with time parsing.
Merge branch 'fix-time-validation-54300220' into develop
[#52124287]  Unformatted modal for drilling down to see more information on fixed-route transit trips.
Merge branch 'julian' into develop
Merge branch 'develop' of https://github.com/camsys/oneclick into ItineraryDrillDown
Merge branch 'develop' of github.com:camsys/oneclick into develop
Merge branch 'julian' into develop
[#52124287]  Unformatted modal for drilling down to see more information on fixed-route transit trips.
Merge branch 'julian' into develop
Drill Down Partial
Drill Down Partial
Merge branch 'develop' of https://github.com/camsys/oneclick into ItineraryDrillDown

Conflicts:
	app/assets/javascripts/application.js
	app/views/trips/_page_scripts.html.haml
	app/views/trips/_transit_summary.html.haml
	app/views/trips/_trip_summary.html.haml
	app/views/trips/_trip_summary_header.html.haml
Merge branch 'develop' of github.com:camsys/oneclick into develop
[Fixes #52124287] A passenger can drill down to find out more information about trips.  Transit trips provide step by step instructions, taxi trips provide a list of taxi companies, and paratransit trips currently link to a placeholder.