Added the "new" method for trip model, fixed error in cascading of Trip entity
Merge origin/master