Created UriBuilder class to make uri manipulations easier
Refactored UrlRewriter using UriBuilder
Replace UriBuilder by URI and UriUtils
Merge pull request #63 from fxbonnet/master

Refactored UrlRewriter and unit tests