fix some bugs
fix rest
Merge branch 'master' of https://github.com/mvaraga/JTravelAgency