add support for dependency injection; add suport for java 7
Merge branch 'master' of https://github.com/mvaraga/JTravelAgency