Merge remote-tracking branch 'origin/master' into poonam-edits
#100 updates

without scrollbar
Merge remote-tracking branch 'origin/poonam-edits'
Merge branch 'master' of https://github.com/harryvok/Merit.PHP.Traveller.Repository.git