changes to admin area that reflect better trips model
Merge branch 'master' into pannellr

Conflicts:
	gtfs_manager.module
Merge pull request #3 from GoMaritimes/pannellr

changes to admin area that reflect better trips model