Merge pull request #14 from emocentmagar/lalit

Lalit
video embed in admin panel
embed video in admin panel
video embed in admin panle
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
admin design changes
nav merged