trip type to activity
schema file
Merge branch 'changing-type-to-activity'
merging branch