Added UrlHelper.
Merge branch 'feature-urlhelper' into dev-master