Create BusLines
Merge branch 'dev' into feature/v2-start
Update rails version
Add V2 controllers for Trips and TripGroups
show trip group id
Add V2 controller for routes
Merge branch 'master' into feature/v2-start

Conflicts:
	Gemfile.lock
Merge branch 'dev' into feature/v2-start

Conflicts:
	Gemfile.lock
	app/models/trip.rb
	config/application.rb
	config/routes.rb
Merge branch 'dev' into feature/v2-start
use gtfs engine
Specify sources in Engine
GTFS indexes
Use yajl for faster json writing
Update DB schema
Temporarily remove old stuff to make room for GTFS development
Update gems
remove empty helpers
Merge branch 'feature/v2-start' into dev

Conflicts:
	app/models/data_pull.rb