Fix template class
Add the fact that is has to extends from a BaseTrip
Add the support of deserialiseJSON to the model classes
Add JSONParsable class
Update layout