Merge remote-tracking branch 'origin/poonam-edits'
Merge branch 'master' of https://github.com/harryvok/Merit.PHP.Traveller.Repository
17/9
Merge branch 'master' of https://github.com/harryvok/Merit.PHP.Traveller.Repository.git
Fixed Typalong Bug (again)
test
Merge branch 'master' of https://github.com/harryvok/Merit.PHP.Traveller.Repository.git
Reset to Default #60
Merge remote-tracking branch 'origin/poonam-edits'

Conflicts:
	4.0.1/inc/js/pages/js.new-request.js
Merge branch 'master' of https://github.com/harryvok/Merit.PHP.Traveller.Repository.git
street names faster