some changes
Merge pull request #49 from emocentmagar/krazz

Krazz
Merge branch 'master' of https://github.com/emocentmagar/fishtail-travel into mitav
minor
minor
Merge branch 'master' of https://github.com/emocentmagar/fishtail-travel into krazz
Merge pull request #50 from emocentmagar/mitav

Mitav
error fixed
Merge branch 'master' of https://github.com/emocentmagar/fishtail-travel into krazz