new version including tizbacs latest changes
Merge remote-tracking branch 'seegras/work' into work

Conflicts:
	dlls/xlive/main.c
Remerged some stuff