Merge remote-tracking branch 'origin/poonam-edits'
Fixes for cached image
Merge branch 'master' of https://github.com/harryvok/Merit.PHP.Traveller.Repository.git
test
cache
James
Merge remote-tracking branch 'origin/master' into poonam-edits