Server: Fix query string concatenation

If the path already contains the question mark starting the query string,
use an ampersand instead.
Merge pull request #96 from jzaefferer/change-url-query-string-support

Server: Fix query string concatenation