Added ampersand to allowed characters in the file path of a HTTP request on the server.
Merge branch 'develop' of github.com:KayEss/fost-internet into develop

Conflicts:
	ChangeLog