Partial network implementation
Fixed intendation
Merge remote-tracking branch 'upstream/work' into work

Conflicts:
	dlls/xlive/main.c