Merge branch 'master' into precise_dma_fifo

Conflicts:
	genemu.cpp
	gfx.cpp
	hw.c
	mem.h
	vdp.cpp
	vdp.h