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

Krazz
Merge pull request #19 from emocentmagar/mitav

Mitav
kajdsfn
template'
admin table updated
Merge pull request #20 from emocentmagar/lalit

Lalit
small changes
Merge branch 'master' of https://github.com/emocentmagar/fishtail-travel into krazz