NoResize
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	SCSIMSIM/obj/Debug/SCSIMSIM.exe
	SCSIMSIM/obj/Debug/SCSIMSIM.pdb