Changes in the model for the recurrency, now in TripDate entity
Little changes about a lot of things
merge model change