Added support of relative uri in query string declaration.
Fixed 'null' being inserted in querystring when original query is missing.
Merge branch 'query_string_support' into custom

Conflicts:
	gateway-rewrite.js