did many things with add new trip staff
Merge remote-tracking branch 'origin/master'