Merge pull request #27 from emocentmagar/krazz

Krazz
Merge pull request #28 from emocentmagar/krazz

changes
changes
confllixt resolve
Merge pull request #29 from emocentmagar/mitav

Mitav
service accordian edit
nav merged
Merge pull request #30 from emocentmagar/lalit

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