Merge pull request #25 from emocentmagar/krazz

Krazz
many changes
Merge branch 'master' of https://github.com/emocentmagar/fishtail-travel into mitav
gallery
Merge pull request #26 from emocentmagar/mitav

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