Merge scsi2sd-util GUI changes

Conflicts:
	software/SCSI2SD/src/config.c
	software/SCSI2SD/src/disk.c
	software/SCSI2SD/src/scsi.c
	software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter.h
	software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.c
	software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfittergnu.inc
	software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitteriar.inc
	software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitterrv.inc
	software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/project.h
	software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cycdx
	software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyfit
	software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyprj
	software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.svd
	software/SCSI2SD/v3/SCSI2SD.cydsn/TopDesign/TopDesign.cysch
	software/SCSI2SD/v3/SCSI2SD.cydsn/scsiTarget/scsiTarget.v
	software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter.h
	software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.c
	software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfittergnu.inc
	software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitteriar.inc
	software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitterrv.inc
	software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/project.h
	software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoCCreatorExportIDE.xml
	software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cycdx
	software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit
	software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyprj
	software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.svd
	software/SCSI2SD/v4/SCSI2SD.cydsn/TopDesign/TopDesign.cysch