fixed invalid delegates
Merge remote-tracking branch 'upstream/master'
Bugs in clicking done fixed for trip and itinerary view controller, picker bug fixed for all pickers, trip add/edit functionality implemented
Merge remote-tracking branch 'upstream/master'