Merge pull request #15 from emocentmagar/khoste

Khoste
conflixt
Merge branch 'master' of https://github.com/emocentmagar/fishtail-travel into krazz
Merge pull request #16 from emocentmagar/krazz

Krazz
some changes
Merge branch 'master' of https://github.com/emocentmagar/fishtail-travel into mitav
admin design changes
nav merged
Merge pull request #17 from emocentmagar/lalit

Lalit
gal db
Merge branch 'master' of https://github.com/emocentmagar/fishtail-travel into krazz
xtra change
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