Adding changes - Navigation to Edit Trips Screen
Merge remote-tracking branch 'origin/CanIMakeItIntegrated' into CanIMakeItIntegrated