developing "add trips"
Merge remote-tracking branch 'origin/develop' into develop