Delete trips
Merge pull request #282 from BeshoSmile/T2.4_HagarEssam_279_deletetrip

T2.4 Delete trip
Resolved Conflict #219