http log server
Merge branch 'master' of github.com:alexjck/XmmpProxy

Conflicts:
	hosts.txt