adding url.json domain resolver
Merge remote-tracking branch 'upstream/master'