#152 and #153
Merge branch 'master' of https://github.com/harryvok/Merit.PHP.Traveller.Repository

Conflicts:
	4.0.1/inc/js/pages/js.new-request.js