tripservice final tests
Merge branch 'master' of https://github.com/mvaraga/JTravelAgency.git