Merge pull request #20 from emocentmagar/lalit

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

Krazz
admin design changes
admin design changes
nav active conflict resolved