Added entity and DAO level changes for Trips filtering and sorting
Merge remote-tracking branch 'origin/develop' into develop