TripController added + json adaptations in model
Merge remote-tracking branch 'origin/master'