Some fixes after merge
Merge branch 'master' of github.com:caujka/TripJournal
Only one .idea