many changes
Merge branch 'master' of https://github.com/emocentmagar/fishtail-travel into mitav
Merge pull request #26 from emocentmagar/mitav

Mitav